diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-23 21:49:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-23 21:49:27 +0000 |
| commit | 9c1f285e86e046ba231d81430f9cddb0bb589fe7 (patch) | |
| tree | 3a36af9399beac699257c7dc8f8bc18fe8388e74 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | bbaf41acd9fe8ecb6d38294200adb222692f0c60 (diff) | |
| parent | e8905d6ec5862ade851a48572c19b08248f1761d (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent size of list changes during mPendingNonWakeupAlarms deliver" am: 06550c33ba am: 40209c2af3 -s ours am: e8905d6ec5 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471525
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iad77c14ce124b2e577af692e19a763dcaacfa931
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions