diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-20 06:29:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-20 06:29:36 +0000 |
| commit | 708fad091d27e895cc1d05cd1727fafb50a370db (patch) | |
| tree | beff9527ca463db7fb492b1c7d5f0cf0c0bf3012 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fb22c06eb45493ec503eb804e16f093c9fc78000 (diff) | |
| parent | a54f2e70244a6d8efd8ace735059976ebcfb7f90 (diff) | |
Merge changes from topic "am-e3cb07a527844fa6b5ffa85e184f8e56" into rvc-d1-dev-plus-aosp
* changes:
Merge "RESTRICT AUTOMERGE Logging for alarms when they hit the limit" into rvc-dev am: 97bd35e552 am: e8ea59e25d
RESTRICT AUTOMERGE Logging for alarms when they hit the limit am: 8ec9561614 am: 72fe499eed
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions