| commit | 314cdb0db6d834e3c0dab859c8084220a8aca197 | [log] [tgz] |
|---|---|---|
| author | Dmitry Shmidt <dimitrysh@google.com> | Wed Oct 26 20:03:16 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 26 20:03:16 2016 +0000 |
| tree | c6785b0272ab92e9fd5e0cc4f1d0fcf35cfc6918 | |
| parent | a3f92afeeb5f51a8ee193dfbf64adf52692a216b [diff] | |
| parent | 6f399d2f9be9ae6ccd4f7a84bc25cef503561a33 [diff] |
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 911a23ccd8 am: 6f399d2f9b Change-Id: Idfef5e9847947ae936c7f7885aa27a421d9557dc