diff options
| author | Hector Dearman <hjd@google.com> | 2019-12-04 16:52:29 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-12-04 16:52:29 -0800 |
| commit | 629e06c2cc50d95645a105b2aba3b59c24d45e60 (patch) | |
| tree | 36718c46d7b28b05824a9ceaa0f5047a877169e3 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | cead28dceecb38ea314a4cc348d664a20a471b71 (diff) | |
| parent | ed1ecfd61611101a07e3db12f7310ae1b14ef516 (diff) | |
[automerger skipped] Merge "Reland Perfetto upload logging atoms DO NOT MERGE" am: 54eb3077e8
am: ed1ecfd616 -s ours
am skip reason: change_id Ia40303aa2a669c301fab912b0b0bdf5ec1259caf with SHA1 f35827bc17 is in history
Change-Id: Ic0cd820c0649c4ce3c26b051cea2495bc9ddfc9c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions