tree 6b0978f56c3ee6de7bedf45d83d78f214b0f4549
parent 7ec818106c7f5c59d1f02b76eba1af45425f8634
parent f3dff7c57b5facc1dcd86bd8a70b261b0f2c7370
author Benjamin Prosnitz <bprosnitz@google.com> 1432839922 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1432839923 +0000

Merge "android/media_sharing: Add box to enter the v-name to connect to"