diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-24 18:58:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-24 18:58:14 +0000 |
| commit | 7bbbb4f6b81689151d667f6272662ee1b7c48829 (patch) | |
| tree | c5b70492a06c39203a12ac306ac469d55d7b3f2d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 02f536d6a654975f7581ae0a5cf9a5192af1c331 (diff) | |
| parent | 21cf15bf5cfd06ae6027d504b8cc859a6676b6ea (diff) | |
[automerger skipped] Merge "DO NOT MERGE MediaCodec: add methods to query/subscribe vendor parameters" am: 59035dd21c am: de806ecda0 am: 21cf15bf5c -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646730
Change-Id: Ifa8d0321069dc04983d7cf8ab60d7ff9c7be3e73
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions