| commit | ff9fd7efc7559bb9bd08705cb546ba1ba362c3a7 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 02:02:36 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 02:02:36 2020 +0000 |
| tree | f2a3455ae2a2900c47147c69e2e676905c2e151a | |
| parent | 6248a87daad7d96fa6ebf00dadef892afebf8436 [diff] | |
| parent | 73e862985134b57627de6906b6e1484ab6d91e39 [diff] |
[automerger skipped] Merge "Merge Android R" am: cdb6b16dec -s ours am: 73e8629851 -s ours am skip reason: Change-Id I1428ead11c6c2d6fd107a014df0082fdbfa9ba8a with SHA-1 c83049d937 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1422430 Change-Id: Ie0c3c190e4578c6107b293cd33f7b185264b6f65