Amit Mahajan 8324e69356 Merge "Change list of applications in CardStatus from array to vec." am: d5eccf520d am: 68f2bd6d49 am: 5cb3c65758 ... am: 7f5243c9d1 Change-Id: I81deccea2fe918075bc8ebdf2e41a517ba1f5f44		2017-01-05 18:08:37 +00:00
..
1.0	Change list of applications in CardStatus from array to vec.	2017-01-04 16:52:34 -08:00
Android.bp	Stop all these merge conflicts.	2016-10-26 12:05:29 +02:00
Android.mk	move VTS HIDL HAL tests to the corresponding interface directories	2016-11-21 19:16:12 -08:00