| commit | c28aa19e74a6a08b57d8183a616cd95bdd6d89a7 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon May 17 07:03:24 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 17 07:03:24 2021 +0000 |
| tree | d3314fb01d212a5958b048ddd40d45f37e88adff | |
| parent | 2b51ba012b8ec6bc5fcf72cd8ddb5dec90382f82 [diff] | |
| parent | 14f8090d921114891b71e6b11a43dd4eef36a45b [diff] |
[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: f2a516095e -s ours am: f4f6e27ce7 -s ours am: f60bb2159c -s ours am: c34fb62965 -s ours am: 7373c1c4ea -s ours am: 14f8090d92 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1700266 Change-Id: Iae9a1ca62f934c8a36062ef10934244380f6e975