commit | c70a534b08bbd4ff2a3b737954dc68f2bb01eab2 | [log] [tgz] |
---|---|---|
author | Xin Li <[email protected]> | Fri Sep 11 02:02:27 2020 +0000 |
committer | Automerger Merge Worker <[email protected]> | Fri Sep 11 02:02:27 2020 +0000 |
tree | 9f3ca8b30cf4217071d58f09e01a037b15f7d55f | |
parent | 2f65e12f9f12ee3fb2f22341795064ec44f923fd [diff] | |
parent | a8a47a3732518a1e430202efd21cb22a6f620bed [diff] |
[automerger skipped] Merge "Merge Android R" am: 61cddc9080 -s ours am: a8a47a3732 -s ours am skip reason: Change-Id Ia938e70f256d6d9b9c80f056cb473c8803257e27 with SHA-1 646ebffe4b is in history Original change: https://android-review.googlesource.com/c/platform/pdk/+/1422481 Change-Id: I47e64c31a6229e1bdf50ad2a6924895819ae772e