commit | bf17b58f6082d3b5cf0ba68998ed279a8c9a1cf7 | [log] [tgz] |
---|---|---|
author | Dmitry Shmidt <dimitrysh@google.com> | Fri Jun 30 17:22:43 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 30 17:22:43 2017 +0000 |
tree | ee8acecec9945631698bda24e02a3e63d2885b0d | |
parent | d12728add197560b5d9281bc6f1fe08387b884a7 [diff] | |
parent | 5dca885968606dba0ef6592d90b0a1a1c8027ebc [diff] |
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk am: b26de94592 am: 99d893a486 am: 527bce9ce4 am: 5dca885968 Change-Id: I6af0ab21dfc7f43ac09aee0b43420e2e765910df