commit | 0ccb09bc5cf234759b6dfd9c523a337ed50d8e97 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 21:27:18 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 21:27:18 2020 +0000 |
tree | 37346613b4004b372d58242c0a71879441db7d7f | |
parent | 1b835529900f5f26bd64fa4a05f3f28584c238d4 [diff] | |
parent | ce940c51ea142b1a416d54b3bbbeaed6acfff585 [diff] |
[automerger skipped] Merge Android R am: 42b2be02df -s ours am: 5e804e3205 -s ours am: 4cddc077d1 -s ours am: c9a36c9f3b -s ours am: ce940c51ea -s ours am skip reason: Change-Id I4c6584a78c1296b9fe65edeafe7aba3f143f3b56 with SHA-1 128d9d29db is in history Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1422301 Change-Id: I830c3179ce29b4a93a94708499f98db91dc07e1f