| commit | 8ba116a1c44482ce9786eb1c7f6b4c327f5c6bdc | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 21:27:54 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 21:27:54 2020 +0000 |
| tree | 6dba6a8ddcbefd1eeef221e11b217798d2ba4db4 | |
| parent | 9015e0f59b2f925711b0b55618cb065e44e627ca [diff] | |
| parent | 87c4a9300250f3e401277c1a4f48bc95e230ee01 [diff] |
[automerger skipped] Merge Android R am: 785c2bcbe6 -s ours am: eb3ab2267e -s ours am: f31d1ca5a0 -s ours am: b0c77871b0 -s ours am: 87c4a93002 -s ours am skip reason: Change-Id Ia8ae3d390e8ce65cc391f18eb2faba68701d32d4 with SHA-1 a7aaaa718a is in history Original change: https://android-review.googlesource.com/c/device/generic/uml/+/1422308 Change-Id: I4ec34d1f2245a783f042e5a877c3008854109ca2