diff options
| author | Hector Dearman <hjd@google.com> | 2019-11-12 10:48:55 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-12 10:48:55 -0800 |
| commit | bf83edfc5fa4043e30f1973c883c24376db9ab8a (patch) | |
| tree | 705da0df0f6fa234c9927c0e7a70570d20a7d0ba /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | b71eb484e75dc9ce1acedbeed0a869be0a318e46 (diff) | |
| parent | d9b11a283d2cd858206a2cb53f032671050fa142 (diff) | |
[automerger skipped] Merge "Add Perfetto upload logging atoms" am: 07c402335a -s ours
am: d9b11a283d -s ours
am skip reason: change_id I8f41d72c8f96a004911ef68491de8a214da4db24 with SHA1 32a89c15a7 is in history
Change-Id: I3dbaad920912ef01dd5b9a5c1d23c14707a4e4dc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions