commit | 05aa9c66b310f7fb7aa748de7131af4c61f29430 | [log] [tgz] |
---|---|---|
author | Dmitry Shmidt <dimitrysh@google.com> | Wed Oct 26 20:11:47 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Oct 26 20:11:47 2016 +0000 |
tree | c6785b0272ab92e9fd5e0cc4f1d0fcf35cfc6918 | |
parent | e49e88ab04333f2682de224fe23a6d3a7c1554e5 [diff] | |
parent | a3d50249601e68f7d3c885d4259725c54130a213 [diff] |
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 911a23ccd8 am: 6f399d2f9b am: 314cdb0db6 am: a3d5024960 Change-Id: I1b3274e93e6682db6e6910febfef60d4d24a749e