OSDN Git Service

Merge "Add resource based mechanism to grant default permissions" into nyc-mr1-dev...
authorSvetoslav Ganov <svetoslavganov@google.com>
Fri, 19 Aug 2016 13:28:48 +0000 (13:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 13:28:48 +0000 (13:28 +0000)
am: de63b40374

Change-Id: Ib9fe0ee2efdb9271e7a3a7d551d1e141438f192b


Trivial merge