Zhuoyao Zhang 60a3eee183 Merge "Update Andriod.bp for hals."		2017-02-03 23:46:49 +00:00
..
fingerprint/2.1	Merge "Update Andriod.bp for hals."	2017-02-03 23:46:49 +00:00
Android.bp	Stop all these merge conflicts.	2016-10-26 12:04:37 +02:00