summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-11-05 19:44:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-11-05 19:44:21 +0000
commit961107d8bd5e3a74f82a8c54ac818bb10959a3ac (patch)
tree9856e4ef039d784e79de8b9f8241ef2b222a553a /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf054d0d245f8c0673651583a5fcd656d86fd2b23 (diff)
parent0886095ed44a4ed313576a0de5c2972aa01d5026 (diff)
Merge "[automerger skipped] Merge "Do not use hidden API ParcelableException" am: e777c27788 am: b35b54f79b am: 6b4a5300e8 -s ours am skip reason: change_id I92dd527aad1e174871c330d1c043189407e136cb with SHA1 1542314273 is in history"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions