diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-16 18:53:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-16 18:53:02 +0000 |
| commit | b4e7555bc31bbea67d90f5be689f3d9a7d9f15c9 (patch) | |
| tree | f7362c8ee182a67942aa3c9cd346b4cff92894b6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 2121409e3570ae74276bc5c961e9a8687734d25d (diff) | |
| parent | 91869903e4c74cd5b1ba91c96dcd2d981e0aeaf2 (diff) | |
[automerger skipped] Merge "Expose MediaExtractor entry point to MediaMetrics" into rvc-qpr-dev-plus-aosp am: 91869903e4 -s ours
am skip reason: Change-Id Id10861db464b88734c34c81db945b1a828f0bc2c with SHA-1 0538d6c4b7 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13228933
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I25ce18b246d303bebf383e2f20381c0c819e8e2d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions