summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJulia Reynolds <juliacr@google.com>2021-04-29 19:47:18 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-29 19:47:18 +0000
commit9b873fe85ec1b5b8dac3717c2db98ab9a579f4da (patch)
tree3a9dd5741547399c48c004d6a8d5dd6134dcbaa6 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent1cfbf3a69ed77c1be12afe02e68e09f71f7afd14 (diff)
parentf70b22f3be64115c9c80d521893c61d8b3549bbc (diff)
[automerger skipped] Restrict alarm broadcast am: d61aae299c -s ours am: 08db350c8b -s ours am: 80b1e85c12 -s ours am: f08bd224bb -s ours am: f70b22f3be -s ours
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 f1e84b42b1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14102393 Change-Id: Ibda9eec07625c1c002ea16bf9f1b79234e56eab7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions