| commit | f2bb539744e4a9359637dd30422518833fd9b5bd | [log] [tgz] |
|---|---|---|
| author | Dmitry Shmidt <dimitrysh@google.com> | Thu Aug 25 22:43:46 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 25 22:43:46 2016 +0000 |
| tree | 538058f0657edb8343444b5a179ff604db33e7a5 | |
| parent | a75b485f0f0c04d63d84a9f44019f818fd3016f1 [diff] | |
| parent | 900cf0c6d09cc4a8d7226f4945de3a53881527bb [diff] |
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 15efc9efd6 am: 261537f6ca am: 6e1dee2899 am: 900cf0c6d0 Change-Id: I6aa0d57ae3c849bb0621eb5a7055042cc49428bf