commit | c08b3838660c59acc845ba3f332f8d507dcfe010 | [log] [tgz] |
---|---|---|
author | Xin Li <[email protected]> | Fri Sep 11 00:40:30 2020 +0000 |
committer | Automerger Merge Worker <[email protected]> | Fri Sep 11 00:40:30 2020 +0000 |
tree | b0f66e2bacf9250c370f5455691ab68403acbbe7 | |
parent | 9963fbe1afc0c8ecaeeb6709b509a973d581edff [diff] | |
parent | 0943187c844c662033520e6598b0ddb3ff8f0790 [diff] |
[automerger skipped] Merge "Merge Android R" am: 0943187c84 -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: I7121e46731cba28a8270042394374654cef8e154