commit | f3036261dfd2977f6695bb8b268027a8d626fdf2 | [log] [tgz] |
---|---|---|
author | Xin Li <[email protected]> | Fri Sep 11 21:27:41 2020 +0000 |
committer | Automerger Merge Worker <[email protected]> | Fri Sep 11 21:27:41 2020 +0000 |
tree | b0f66e2bacf9250c370f5455691ab68403acbbe7 | |
parent | d1f75400c50376f503122991773e763456282698 [diff] | |
parent | 0e61a6c0010cb716d55b42b652800da8a52d7a4c [diff] |
[automerger skipped] Merge "Merge Android R" am: 0943187c84 -s ours am: c08b383866 -s ours am: f461e8c526 -s ours am: 65ffb4102a -s ours am: 0e61a6c001 -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: If898a4d1eaa72276c5b23d752680a7a525d3e8ee