diff options
author | Xin Li <delphij@google.com> | 2021-11-18 03:52:43 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-18 03:52:43 +0000 |
commit | b0c300bd994748206ec1805c68138c9b2910b9ba (patch) | |
tree | 600db2cceed1c6fffd057f37bba63a75f313e843 /.gitattributes | |
parent | 0643cb736ce639be0ebbf73c9937419a3b56066e (diff) | |
parent | df7d649e8565b242a258d9554dded0090720a420 (diff) | |
download | libopus-b0c300bd994748206ec1805c68138c9b2910b9ba.tar.gz |
[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: b70940fbdd -s ours am: df7d649e85 -s ours
am skip reason: Merged-In Icace1828cffaecd45db52671b844fc04e597bc48 with SHA-1 650210f37c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libopus/+/16278445
Change-Id: Ia4b6e6c2bf6cb5d156862513ed0c7f53d6126cba
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions