Sundong Ahn 68f2e828d5 DO NOT MERGE: resolve merge conflicts of e46ab1fd to oc-mr1-dev-plus-aosp ... Test: I solemnly swear I tested this conflict resolution. Change-Id: Ia68993a22b975d9a5dd19175988077481ded7559		2017-08-28 21:35:37 +00:00
..
1.0	DO NOT MERGE: resolve merge conflicts of e46ab1fd to oc-mr1-dev-plus-aosp	2017-08-28 21:35:37 +00:00
utils	Mark hidl utils as vndk	2017-08-04 15:25:13 +09:00
Android.bp	Configstore HAL is down-revisioned to 1.0	2017-08-25 17:05:29 +00:00