commit | 2639bfcf3287de0c287846836f0294ee5c63e74a | [log] [tgz] |
---|---|---|
author | Dmitry Shmidt <dimitrysh@google.com> | Wed Dec 14 18:53:25 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Dec 14 18:53:25 2016 +0000 |
tree | ea505ea7b8c8df7e3ef7b7ca59effa57a8af9047 | |
parent | bf880886bf37b62cb388053f50beccad5ec7eda6 [diff] | |
parent | f1b39a595bf1507370bb7c7aae67087520aa0b1d [diff] |
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk am: dadef6881d am: f1b39a595b Change-Id: Iac298f90fb01d02363c313da5cd9e48d04bcd895