OSDN Git Service

Merge "[AWARE] Simplify Wi-Fi Aware API namespace" am: 834a87d525 am: fd23421472
authorEtan Cohen <etancohen@google.com>
Sat, 7 Jan 2017 18:38:08 +0000 (18:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 7 Jan 2017 18:38:08 +0000 (18:38 +0000)
commit0232d1880571f546d90233608eb86e13b68f7273
tree3db08430d1813a636e9525d3b5045faa2842e207
parentcea9b99099927dce0943d75b4d3ae4c243488c75
parent0bad91b5ac2ec07ab861a5d01285ca12986a5be6
Merge "[AWARE] Simplify Wi-Fi Aware API namespace" am: 834a87d525 am: fd23421472
am: 0bad91b5ac

Change-Id: I10da8332166d94c543ea94519af702961d3a429c