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