OSDN Git Service

Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13
authorEtan Cohen <etancohen@google.com>
Wed, 11 Jan 2017 23:17:19 +0000 (23:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Jan 2017 23:17:19 +0000 (23:17 +0000)
commitb32dfa4ef59e2cdf91360499ae80626fbe48340b
treef6bfb4cec5f497ff53a12a78f878f37227933870
parentab9eb11e2f960346b8eeb52587431ca3cf3f3aaf
parent2a4e3bef2c734171eb17e44d31aeefe1e4502267
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13
am: 2a4e3bef2c

Change-Id: I6f894d92451032657678639c3021eef07289a6a2
core/java/android/content/Context.java