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:42:23 +0000 (13:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 13:42:23 +0000 (13:42 +0000)
am: 42adf24656

Change-Id: Ie8f03b5cf8d1014058f43f6d03bbb6bdcd153534


Trivial merge