diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-15 19:01:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-15 19:01:30 +0000 |
| commit | ad25a87a4d2235b3a902afb578c75d6950dd4735 (patch) | |
| tree | 8d5af62b32de75dbb537f272343faf4d9ebf4bbc /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 22e424f58269c3a8b4d796cec1e8f4ad8cd54016 (diff) | |
| parent | 946b5ee77a87a09c264df0dd21859e621958d942 (diff) | |
[automerger skipped] Merge "Combine uids for CpuTimePerUidFreq atom" into rvc-qpr-dev am: 9622b6d7d0 am: 946b5ee77a -s ours
am skip reason: Change-Id I0d9a18c78f456e1b0f9d7ad322f15354ead9f02b with SHA-1 e69ade3545 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13205190
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0f328d6a0e186ea5e4b3dc5bd4a8ad812ee8d546
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions