| commit | 3e3800f0dc7f1ac58047c803d8d09aa91fcb4a54 | [log] [tgz] |
|---|---|---|
| author | Dmitry Shmidt <dimitrysh@google.com> | Wed Jan 17 20:00:28 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jan 17 20:00:28 2018 +0000 |
| tree | 6d52523df6f907839b295d23d131b02a6d99e975 | |
| parent | 03a789f5c8f08fd2403e4903dbcc6b9cd923b5ff [diff] | |
| parent | cf7dd2dad5c0663d68111149624b47c7b7f6b15c [diff] |
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 2e21932172 am: bfc3f8a315 am: cf7dd2dad5 Change-Id: I95ece28e9571fd93076774ea6c962bc3974bf719