OSDN Git Service

Merge "AAPT2: Allow <path-permission> tag in <provider>" into oc-dev am: 7beb895d75
authorAdam Lesinski <adamlesinski@google.com>
Tue, 25 Apr 2017 15:37:36 +0000 (15:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Apr 2017 15:37:36 +0000 (15:37 +0000)
am: 706b85e855

Change-Id: I7ae22f1f7dd0736ca83261bc6efae5543c560c59


Trivial merge