tree 143a5be61bdc4c730a283243a02da2c4a7920a90
parent 082617d67a4e8fba349572f080181601ece3c823
parent d8d5dde700cf72271f9b6c3f24720633245bd584
author Jerry Zhang <zhangjerry@google.com> 1503978798 +0000
committer android-build-merger <android-build-merger@google.com> 1503978798 +0000

Merge "Add aio_compat to hikey" am: 290d8e4412 am: fcf30d199e am: 610d4a2c6f
am: d8d5dde700

Change-Id: I358684923104803e00d1910e4404a3f48c01f3fc