summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2017-02-12 10:35:43 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-12 10:35:43 +0000
commitceb25d2b5cfa252261095fb1c43da81cc5824c24 (patch)
treeb5d929dd4328d7bdc330ca9eb3e9e2770623f62a /tools/aapt2/java/JavaClassGenerator_test.cpp
parent706ad5ac4bf9dfeba6ccb79e7b135b38587d48b5 (diff)
parent912a5f054cc4f906c941cfd7a276d356b021d32d (diff)
Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70 -s ours am: 48f1ddc94a am: 00f5232dd0 am: 9335807fc4 am: 208dcadb4f -s ours am: 9aca89293a am: ab296986fc am: 55ef8ba763 am: 62314d7dd3 am: 41c9029be0" into nyc-mr2-dev-plus-aosp
am: 912a5f054c -s ours Change-Id: I1f1206f8d3bfb815e2effbc072522ece02a25ce9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions