| commit | 65ffb4102a387b8ac353c3d1673ba979e85b0304 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:41 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:41 2020 +0000 |
| tree | b0f66e2bacf9250c370f5455691ab68403acbbe7 | |
| parent | 4411a27f1ced2d1f0307bb50f785745a6bc29f93 [diff] | |
| parent | f461e8c5267434dd54a6b7b8fe58466cc3b19d0a [diff] |
[automerger skipped] Merge "Merge Android R" am: 0943187c84 -s ours am: c08b383866 -s ours am: f461e8c526 -s ours am skip reason: Change-Id Iaee18ba48fc5a8ec511074dd10d69c383e92583b with SHA-1 9963fbe1af is in history Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1421707 Change-Id: I1cdf6f3a6a546c79894717cc429c13f5116b6e18