| commit | 7dc57eff26cb36da4e7e92e74217855d40a9d56a | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Feb 23 10:34:46 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 23 10:34:46 2021 +0000 |
| tree | f6af2ed52cd26b3b88361cadf134be203da8607f | |
| parent | 87645ab5f53a143a12e9bf67bc5f5e6dcbdcf90d [diff] | |
| parent | d26e85169e170e99499e7808fb72cad545bca0a4 [diff] |
[automerger skipped] Merge ab/7061308 into stage. am: ca3e579e96 -s ours am: d26e85169e -s ours am skip reason: Change-Id I703d82abf612d2a0c7f0d440da6a3e54eadab302 with SHA-1 cc45cabcba is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/13658314 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I70cf70e685f51a83a2be195df9d3b42ea54933a2