diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-17 14:57:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-12-17 14:57:15 +0000 |
| commit | e732527b8b2a2787fce1ef34769afc4e8066bf42 (patch) | |
| tree | 5caae4ed30a043bc6b9f945204620b17c2b60c11 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c6b077b83d3091737632276d9fdf4dc1a1acf4cb (diff) | |
| parent | 69a72b314dec544a070b1f171815e91e8e8140d9 (diff) | |
Merge changes from topic "am-6e6c05bda62741d8a09fc4713c93087a"
* changes:
[automerger skipped] Merge "Add mediametrics enum for MediaExtractor usage" into rvc-qpr-dev am: 129fb5a990 -s ours am: cb87fecf15 -s ours
[automerger skipped] Merge "Expose MediaExtractor entry point to MediaMetrics" into rvc-qpr-dev am: 84396160e4 -s ours am: f6230e890a -s ours
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions