tree 5b93e28a2b446f7824caa1a92f01afa62266ff4a
parent a57da42f967089081914426167ee2f6efe5bc361
parent 4ac1cdea350da9643dcec4ab1f979adbcef1f366
author Dmitry Shmidt <dimitrysh@google.com> 1487128766 +0000
committer android-build-merger <android-build-merger@google.com> 1487128766 +0000

Merge "hikey: Change TARGET_KERNEL_USE to access kernel version" am: ee455b6056 am: bf57c8780d am: a29173b720
am: 4ac1cdea35

Change-Id: Ic4ee3ab3ca3b3f68106a5385274050434860d940