summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSooraj Sasindran <sasindran@google.com>2020-07-09 22:41:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-09 22:41:48 +0000
commitd8a30cf5b077e982528d3aeb5ecf37110b56b3bf (patch)
treeaf815a8b2fb99f7ae4a1b27f698df80d9bafee8c /tools/aapt2/java/JavaClassGenerator_test.cpp
parent56cf7399ec8da5290009c3183da5d6fbf6223b79 (diff)
parentebbf1b3509c9ccb676d657db07fe4253114bb71f (diff)
[automerger skipped] Merge "Use FLAG_UPDATED_SYSTEM_APP" am: 68a510ac32 am: 4aa8851cc4 -s ours am: b5398d04e8 -s ours am: d9ca8a3aa9 -s ours am: ebbf1b3509 -s ours
am skip reason: Change-Id I1991e98bb1edb7d0628a7011df7488fbf5de3579 with SHA-1 af41d87ede is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1358923 Change-Id: I838d36977021a7b904970be78f352b90d3c8c6fe
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions