diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-18 20:13:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 20:13:59 +0000 |
| commit | 220b9a18fa5d5f5da3ff84642e9f5be8470301ed (patch) | |
| tree | 638c28806a3408820619cd58debb9dcd8abebbee /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 116537e5fdc8012779414bb889e73061ab70c7fa (diff) | |
| parent | 82d75b27d935a5bccc4fbc549483a77abbd5f351 (diff) | |
Merge "Add additional optional audio/x-mpeg MIME type to MIME type map" into rvc-dev am: ed44012906 am: 82d75b27d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11899480
Change-Id: I1e9f569a53f4c1e5657b3a4d00fe33677b64902a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions