summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorKevin Chyn <kchyn@google.com>2020-05-11 13:29:29 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-11 13:29:29 +0000
commit1eb3e7110e7cb765bdf6d605f233e9414ac4cf88 (patch)
treec52976d32d9e8a455acd1e3cf5efd6fcb9f3d0f3 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentaf61d15d989cf80573812e198b0daee56eeab0d7 (diff)
parentc54c09cc9bd2e77fdfb070bba2453bef6b7070c0 (diff)
[automerger skipped] Merge "[DO NOT MERGE] Add sysUiSessionId between BiometricService and AuthController" into rvc-dev am: f67a780c33 am: c3879bf191 am: 1088edf27e am: c54c09cc9b -s ours
am skip reason: subject contains skip directive Change-Id: Id38a533cb9a8386f684c2ad7fc8ef25022dfe41d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions