diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-06-17 22:58:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-17 22:58:34 +0000 |
| commit | de4a1d6125012ef936e952db0dc3ea2ed55c933e (patch) | |
| tree | 825f49297082c523f9e16a17f9ec399b7e35eee5 /.clang-format | |
| parent | af845c35305659a757fdf462c1853fb33efd951c (diff) | |
| parent | 9cf12aa868b9fdbd9e15e0f215c41192aad4aa45 (diff) | |
| download | fdk-aac-de4a1d6125012ef936e952db0dc3ea2ed55c933e.tar.gz fdk-aac-de4a1d6125012ef936e952db0dc3ea2ed55c933e.tar.bz2 fdk-aac-de4a1d6125012ef936e952db0dc3ea2ed55c933e.zip | |
[automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2231acfd62 am: 8f53fdaaa6 am: 8da1061f74 am: 2c2abe9736 am: 9cf12aa868 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078
Change-Id: Ia697176fcde810faa01a30e669cd17cd7a921dce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to '.clang-format')
0 files changed, 0 insertions, 0 deletions