| commit | a5ae704141b8076bfdfff327936eb12ac6a1fc09 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:28 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:28 2020 +0000 |
| tree | 3b3ace12db0033607cdf3324f4c1558e3505e4a7 | |
| parent | 7e83b78b468ed54d0c8ed62735532aff66511850 [diff] | |
| parent | f04d0b1da8aafd281e6768993681532e262e3dc1 [diff] |
[automerger skipped] Merge "Merge Android R" am: 15d5212fcf -s ours am: f48137dbb0 -s ours am: f773151884 -s ours am: f04d0b1da8 -s ours am skip reason: Change-Id Idc7ddb63acda5e6fdea80145bb479a6aff369e70 with SHA-1 9546d1c9a8 is in history Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/1421759 Change-Id: I82d485908a7448317852aa61cd1c4e76b4003632