summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-13 17:11:18 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-13 17:11:18 +0000
commitd56c782f8d9d338627a39f321bcb7251c8b881c7 (patch)
tree0499fd7cab670d7543a006a636a61a070aed755b /tools/aapt2/java/JavaClassGenerator_test.cpp
parent1413c3c4c47fba261f5f708a4a06479db9946e1b (diff)
parentca1872dc0ddb61b1d931061b67779a49aab7a90b (diff)
[automerger skipped] Merge "Camera: Add new hidden API for camera open/close callback" into qt-qpr1-dev am: ca1872dc0d -s ours
am skip reason: Change-Id I04cae782d96f0e32be8ef588dcd328f84b32887a with SHA-1 e375ee8f8a is in history Change-Id: I45977bb6d39aa59aaee98feb8a2326a8e798f6f1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions