| commit | 2a993ca1d18c9859088959abc75778e4aec7cc20 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Dec 10 03:46:59 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 10 03:46:59 2020 +0000 |
| tree | 491b722214c703570e2a614347035707ee701a71 | |
| parent | 6a57433561b6d1f2b8c8bc77f9f37c2cdbdfef50 [diff] | |
| parent | 70cb1ee42c943791b3f6491f79ec8b64807c64de [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: c111882305 -s ours am: 70cb1ee42c -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: I9fff46ecddbb98da2b585bf6b9e28e66f2fb7772