Steven Moreland eccc0081c8 Remove HIDL_GENERATED from things written by hand. am: 33e87b8a76 am: 8b6a886d60 am: 35460073b3 ... am: 6817b001f1 Change-Id: Ied2a612dbeac019fa764eeb8375d6e68f0ff7e66		2016-11-23 01:51:19 +00:00
..
1.0	Remove HIDL_GENERATED from things written by hand. am: 33e87b8a76 am: 8b6a886d60 am: 35460073b3	2016-11-23 01:51:19 +00:00
Android.bp	Stop all these merge conflicts.	2016-10-26 12:05:29 +02:00