OSDN Git Service

Merge "Fix #62350081 - annotate permission requirements" into oc-dev am: 42abe82bbb
authorChristopher Tate <ctate@google.com>
Tue, 6 Jun 2017 20:43:28 +0000 (20:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Jun 2017 20:43:28 +0000 (20:43 +0000)
am: 169a884f81

Change-Id: I87140161d20185cd94a6b8b714ae90c5c5b9a773


Trivial merge