| commit | 70cb1ee42c943791b3f6491f79ec8b64807c64de | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Dec 10 03:05:35 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 10 03:05:35 2020 +0000 |
| tree | da1a15ecc5754c88a9a80db43d7d26bd07b5f7d7 | |
| parent | 44900ea50fa3d0d74ec3787f09257181c1dc5131 [diff] | |
| parent | c1118823051ec59d723f985198830a8828bfcf91 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: c111882305 -s ours am skip reason: Change-Id I768a7f6ad34340864cab5296d946536401fb2f1e with SHA-1 44900ea50f is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1520605 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I958322224413c192a6eb2cf35e93705af49a61e7