tree c6785b0272ab92e9fd5e0cc4f1d0fcf35cfc6918
parent a3f92afeeb5f51a8ee193dfbf64adf52692a216b
parent 314cdb0db6d834e3c0dab859c8084220a8aca197
author Dmitry Shmidt <dimitrysh@google.com> 1477512437 +0000
committer android-build-merger <android-build-merger@google.com> 1477512437 +0000

Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 911a23ccd8 am: 6f399d2f9b
am: 314cdb0db6

Change-Id: I2f1b294680b6d665eff37bdb456e93b50b5f2e08