diff options
| author | Chi Zhang <czhangsd@google.com> | 2020-06-09 19:41:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 19:41:21 +0000 |
| commit | 7ed802581d4807476c9e4a12f36960801302ee55 (patch) | |
| tree | 6d6c4d628077e65c3c949ef71d5d38ee24632b0f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9391dad80825fcd6e0d5d9f564d074645e7bbbbd (diff) | |
| parent | 58545d55811f28ddfbad41c680fe6d9b374b712a (diff) | |
[automerger skipped] Merge "Telephony statsd atoms." am: b7254735e2 am: c4d0c9435f -s ours am: 8d5940ea58 -s ours am: 58545d5581 -s ours
am skip reason: Change-Id I124cf2da59ed4c5e92406081aac0df0f347ace74 with SHA-1 bb9ed92165 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326497
Change-Id: I12e270deca3a3fe33f308b8825a21287a55b3712
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions