tree ea505ea7b8c8df7e3ef7b7ca59effa57a8af9047
parent e0731f1af72a2dc8d3cdc83ecfc7f18a3bc9d441
parent 09fc3d39493c50b938317477cc7095cee853eb33
author Dmitry Shmidt <dimitrysh@google.com> 1481742365 +0000
committer android-build-merger <android-build-merger@google.com> 1481742365 +0000

Merge "Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk" am: 50b0c33452 am: 01f7ad0983 am: 404ddd4dfd
am: 09fc3d3949

Change-Id: I13174e96569a6da676eb3255e2dc93edd2ba926d