commit | b6cfb58831d750b05b93a19f8268b5a79233fdcb | [log] [tgz] |
---|---|---|
author | Dmitry Shmidt <dimitrysh@google.com> | Thu Feb 01 16:42:05 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Feb 01 16:42:05 2018 +0000 |
tree | ed9376e1cc2928b538e30aa6489bb67f5c2d89a8 | |
parent | cf7dd2dad5c0663d68111149624b47c7b7f6b15c [diff] | |
parent | e6e91c7c2bfe19a2157c47679aeb2c93ebe0c4cc [diff] |
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 70378c6da6 am: e6e91c7c2b Change-Id: I78c46d62288192b018d0f62d34ffaf6b6d4f1e8e