tree c6785b0272ab92e9fd5e0cc4f1d0fcf35cfc6918
parent a3f92afeeb5f51a8ee193dfbf64adf52692a216b
parent 911a23ccd8744303788510039026b836f919262e
author Dmitry Shmidt <dimitrysh@google.com> 1477511957 +0000
committer android-build-merger <android-build-merger@google.com> 1477511957 +0000

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

Change-Id: I5cf0084230838f43eea342d0083f649b3a0fc5f6