| commit | e07e372c02dca2d66822705ce3b363cd314091dc | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:26 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:26 2020 +0000 |
| tree | 83482ac4015a71d3b2b420c30956e150cb08698f | |
| parent | 6d912f8d8c2d248d295ec5843b815157118ec1d8 [diff] | |
| parent | ff9fd7efc7559bb9bd08705cb546ba1ba362c3a7 [diff] |
[automerger skipped] Merge "Merge Android R" am: cdb6b16dec -s ours am: 73e8629851 -s ours am: ff9fd7efc7 -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: Ie344d19e1523b967046adf84a1827bb1c8ddf687