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-07-06 22:59:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-06 22:59:58 +0000
commitbf21ae419d9cd3afabe27c2e7955ffa631aad83f (patch)
tree64e2d863e05073c85a89e48efd0ac7f882f5e422 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent8170d8c6275132bd27d5c2aaf9bcc472adeb8c9d (diff)
parentbbf0688360299d6fea97fa6a99c80bf24397fe21 (diff)
Merge "Merge "Check PendingStartActivityUids in getAppStartModeLocked." into rvc-dev am: 66929380ab am: 235421ccd4 am: f9301fd850" into rvc-qpr-dev-plus-aosp am: bbf0688360
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12055922 Change-Id: Idf441a975c59af7c196b1d1b8e613d525b65b604
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions