diff options
| author | Andy Hung <hunga@google.com> | 2021-04-23 21:03:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-23 21:03:05 +0000 |
| commit | 72ef374b5f6206ef18ed012a0bd0809e34c2f4bc (patch) | |
| tree | f8c072a617bd43b82a27fca97436308beda5703c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0addbd59ef21e2f8cb475fd218cf44c43b20464f (diff) | |
| parent | 9fe576be8b36e8ce080ac39332aee1ab1098ff8a (diff) | |
[automerger skipped] Merge "AudioFormat: Add ENCODING_PCM_32BIT ENCODING_PCM_24BIT_PACKED" am: e468f6c151 am: 32010fbba7 am: 9fe576be8b -s ours
am skip reason: skip tag Change-Id I92a099e98dd20ef900765928cbacea5e8a940c3c with SHA-1 cec9647e0f is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670486
Change-Id: I3f899cafd0b96cb54a28a5a2d9673ad47c7fd746
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions