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 23:00:30 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-06 23:00:30 +0000
commitaa388d2c20be0159285628377b98f0ef6eb607e2 (patch)
tree64e2d863e05073c85a89e48efd0ac7f882f5e422 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentbf21ae419d9cd3afabe27c2e7955ffa631aad83f (diff)
parentfef9702bbac592480e1237ccd5a921baf7a1114c (diff)
Merge "Merge "Check PendingStartActivityUids in getAppStartModeLocked." into rvc-dev am: 66929380ab am: 1cfab36cfc" into rvc-d1-dev-plus-aosp am: 32f6324141 am: fef9702bba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12055922 Change-Id: Ia2cc6fb40db883eb462e6e234c514eff901a0a2f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions