tree 4bd624b548e16c41e737a5aa2dca8bbb7df7b08e
parent 75f22837575eaaeeee0eb86fb042b41d918aad9b
parent 706b85e855d76f8cb0aaaefa4a35a9bdc3653343
author Adam Lesinski <adamlesinski@google.com> 1493134656 +0000
committer android-build-merger <android-build-merger@google.com> 1493134656 +0000

Merge "AAPT2: Allow <path-permission> tag in <provider>" into oc-dev am: 7beb895d75
am: 706b85e855

Change-Id: I7ae22f1f7dd0736ca83261bc6efae5543c560c59