summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2017-02-09 17:54:24 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-09 17:54:24 +0000
commit3eacb58a494f5ed65e83ac8e15a60c579c0c3805 (patch)
tree7e7872101e4544c76389311613176b399c7c46b5 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent1de3df7afc1f44a3d869aa6eb7d8c1500ed3181b (diff)
parent37115274c0e2dd5f6a8d96815bf13ca1d84e896c (diff)
Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: a78841ebd4 -s ours am: be0dab477e am: 47656a3cbd am: 99755cb458 am: 0a2374524a" into nyc-mr2-dev-plus-aosp
am: 37115274c0 -s ours Change-Id: Ieb469af9a2748809f428394db82c1694699fc9f2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions