diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-17 14:56:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-17 14:56:40 +0000 |
| commit | a80171a1cccbab7767dbc7add78ec5d3d08e21ab (patch) | |
| tree | 2086640ffc6f42b1d113048a0014eec983eb3604 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 25c0d56368a42f2e748bfa43b5475daf90dca4a3 (diff) | |
| parent | f6230e890aa8537aab5a2d634bcded5fba0e4749 (diff) | |
[automerger skipped] Merge "Expose MediaExtractor entry point to MediaMetrics" into rvc-qpr-dev am: 84396160e4 -s ours am: f6230e890a -s ours
am skip reason: Change-Id Id10861db464b88734c34c81db945b1a828f0bc2c with SHA-1 6b6699abe5 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13217195
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I94b1d39462bcaea9f8613902c31740659537bed0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions