tree 5aabba8430e11b9b40cb6054202de3e473fa2a7a
parent f75ba075e4d96dde3fc4c6340a790c7ef64bd116
parent 95c5375a8503bff36a34e8147b2d97747f3da808
author Remi NGUYEN VAN <reminv@google.com> 1554093482 -0700
committer android-build-merger <android-build-merger@google.com> 1554093482 -0700

Merge "Move permissions from base to standard manifest"
am: 95c5375a85

Change-Id: Ic15b12fd9656bb60aca616a8610df49e568a80e7