OSDN Git Service

Merge "Add permission annotation to RadioManager methods." into oc-mr1-dev
authorTomasz Wasilczyk <twasilczyk@google.com>
Tue, 1 Aug 2017 17:59:37 +0000 (17:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 Aug 2017 17:59:37 +0000 (17:59 +0000)
commit5f935d47db711a6585fce1d0fee05062f579f7a2
tree235b58eeedff9b4345c9eb4c3b70cbba3527ab6f
parentae0b9ee687a75080d16b35c174c62bcdfa0a9969
parentf299ab10e7c2e61d4199a6e423a9ebd7e14626c2
Merge "Add permission annotation to RadioManager methods." into oc-mr1-dev
am: f299ab10e7

Change-Id: Ia2955b23a8e07a7ca921c93187454c488be08041