summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSerik Beketayev <serikb@google.com>2020-12-16 20:12:15 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-16 20:12:15 +0000
commit8013893ddd425268b0d4c40d65d24ef4476397fb (patch)
treee59304da736072c505ba0097ec0f304c8644683e /tools/aapt2/java/JavaClassGenerator_test.cpp
parentbee469edf800c9dce06a6a3acfaab1607cf021a3 (diff)
parent7f846117b170deb3eeb43a06a7d5dfebe6456a53 (diff)
[automerger skipped] Merge "[NetworkPreferenceApp] Initial skeleton" am: 94e3f4ba8f am: e5473840c5 am: 7f846117b1 -s ours
am skip reason: Change-Id Ibb3a39bbe3d881a94b80411f324a7b4b0e37f9c3 with SHA-1 118f8b9d52 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519808 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iacd2a71ff915c5d9f361e33b13d7390c2ae45eb1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions