tree 143a5be61bdc4c730a283243a02da2c4a7920a90
parent b4a97d7180d8c123b5444835f9477495071ddc73
parent fcf30d199e00d3e7ee7718610ae1e935e93c8cf4
author Jerry Zhang <zhangjerry@google.com> 1503978176 +0000
committer android-build-merger <android-build-merger@google.com> 1503978176 +0000

Merge "Add aio_compat to hikey" am: 290d8e4412
am: fcf30d199e

Change-Id: I017f6409acc21705aabb0a5b005009b3385e060d