OSDN Git Service

Merge "Javadoc update for permission requirements" into oc-mr1-dev
authorAmith Yamasani <yamasani@google.com>
Fri, 8 Sep 2017 02:39:11 +0000 (02:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Sep 2017 02:39:11 +0000 (02:39 +0000)
commita2207908558ef637f91432e48a671a60c24eaeec
tree52b8a1f15c08ac4e4121ea0dad578b0656d0e9f1
parent19e83f3983d76b35b5116b2bbd867d3160f7f7b2
parent2ce2f84999cc3e627d4f6aed316b50ae7179b004
Merge "Javadoc update for permission requirements" into oc-mr1-dev
am: 2ce2f84999

Change-Id: I6703ab1128202f5928d574c55d0f4a9129c95b60
core/java/android/bluetooth/le/BluetoothLeScanner.java