diff options
| author | Chi Zhang <czhangsd@google.com> | 2020-06-09 18:18:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 18:18:49 +0000 |
| commit | 8d5940ea584f021121982fa55c09c2e3e9bdbb62 (patch) | |
| tree | 388b53101c25401f97f44a74c4dba4cf11c8681b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d471a804253c024188e4723dbdd059660c1ea948 (diff) | |
| parent | c4d0c9435f5e0557f17ffe978d5d5dad7a580b14 (diff) | |
[automerger skipped] Merge "Telephony statsd atoms." am: b7254735e2 am: c4d0c9435f -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: Ibd4dd9c7741017376b08e52072708383a71f3f95
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions