diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-18 20:14:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 20:14:08 +0000 |
| commit | 1ae6c9f481116a4b622337e367477bf75409da32 (patch) | |
| tree | 29fdec4fa5440b773b96f4c387bd4aa0582db251 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | be5745669a193e10a12c6079e4f5a2d1c6343e2c (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: I82b3459238c392d58c729d9d8ccb02341f85d23b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions