commit | a3f92afeeb5f51a8ee193dfbf64adf52692a216b | [log] [tgz] |
---|---|---|
author | Dmitry Shmidt <dimitrysh@google.com> | Tue Aug 30 21:57:12 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Aug 30 21:57:12 2016 +0000 |
tree | 58e19f79fd49ca0312c902ddca4d8a072b7f2c6b | |
parent | 900cf0c6d09cc4a8d7226f4945de3a53881527bb [diff] | |
parent | 1a17964e48ea070c80de223fd27d886e2bb8272f [diff] |
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: da41388f7d am: 62941329a1 am: 1a17964e48 Change-Id: Id347417c1be55054ee8a83de19a2afa50b449546