diff options
| author | Xin Li <delphij@google.com> | 2022-06-17 19:57:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-17 19:57:41 +0000 |
| commit | 2e02d4c91cc4bec0bb77db9f8a70268c80e3bd09 (patch) | |
| tree | 825f49297082c523f9e16a17f9ec399b7e35eee5 /libFDK/include/common_fix.h | |
| parent | 9eb437d8ca6b074e65917be144a87af092584976 (diff) | |
| parent | 1a013376bdec4115a2f6bf10ec50cb253a39f584 (diff) | |
| download | fdk-aac-2e02d4c91cc4bec0bb77db9f8a70268c80e3bd09.tar.gz fdk-aac-2e02d4c91cc4bec0bb77db9f8a70268c80e3bd09.tar.bz2 fdk-aac-2e02d4c91cc4bec0bb77db9f8a70268c80e3bd09.zip | |
[automerger skipped] Merge "Merge Android 12 QPR 3" am: cb00f5235d -s ours am: 5ccfd6ac78 -s ours am: 1a013376bd -s ours
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004
Change-Id: I42c52aac9bcff66d7dbeb5da3964bc1039827306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libFDK/include/common_fix.h')
0 files changed, 0 insertions, 0 deletions