| commit | 6e1dee2899894d55d6fc8791bcada85cdf6a5215 | [log] [tgz] |
|---|---|---|
| author | Dmitry Shmidt <dimitrysh@google.com> | Thu Aug 25 21:52:17 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 25 21:52:17 2016 +0000 |
| tree | 538058f0657edb8343444b5a179ff604db33e7a5 | |
| parent | 698f96bb000de7db9989ca42a5076d4bc2058117 [diff] | |
| parent | 261537f6ca45cd119a820086a50f204f0a62685a [diff] |
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 15efc9efd6 am: 261537f6ca Change-Id: I7982ca5c7bf272aad8992a6d3efa9b62f4ccc749