| commit | 6347d4aaf46dbeff1d96a6ae10a2528d20fcbf4e | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:58:57 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:58:57 2020 +0000 |
| tree | 1509e10cba9baa7a506a650bce7d755980fe31c1 | |
| parent | 2a680b7eef5ace561e4036121c9465270945f51f [diff] | |
| parent | e07e372c02dca2d66822705ce3b363cd314091dc [diff] |
[automerger skipped] Merge "Merge Android R" am: cdb6b16dec -s ours am: 73e8629851 -s ours am: ff9fd7efc7 -s ours am: e07e372c02 -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: I3b88702b71f94a0fa7af798c021c9e5590fec6cb