commit | cf7dd2dad5c0663d68111149624b47c7b7f6b15c | [log] [tgz] |
---|---|---|
author | Dmitry Shmidt <dimitrysh@google.com> | Wed Jan 17 19:58:26 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jan 17 19:58:26 2018 +0000 |
tree | 6d52523df6f907839b295d23d131b02a6d99e975 | |
parent | d1bd265f8683e4f7b3470122e9b162b1e770ef3d [diff] | |
parent | bfc3f8a315d53e8968db41bd7996e57411f51a92 [diff] |
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 2e21932172 am: bfc3f8a315 Change-Id: Ib6b400f4340da07a2bb2d75b2df6c4571f52350d