commit | f461e8c5267434dd54a6b7b8fe58466cc3b19d0a | [log] [tgz] |
---|---|---|
author | Xin Li <[email protected]> | Fri Sep 11 02:02:50 2020 +0000 |
committer | Automerger Merge Worker <[email protected]> | Fri Sep 11 02:02:50 2020 +0000 |
tree | b0f66e2bacf9250c370f5455691ab68403acbbe7 | |
parent | 489d395987cff6ed8aa4e7c701e05d4768ee0755 [diff] | |
parent | c08b3838660c59acc845ba3f332f8d507dcfe010 [diff] |
[automerger skipped] Merge "Merge Android R" am: 0943187c84 -s ours am: c08b383866 -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: Ib3bc90b76f92522be94dcd5834673a2de144f8c5