SzuWei Lin 35998bb8e5 resolve merge conflicts of a24fcf6abc to oc-dr1-dev-plus-aosp ... Test: I solemnly swear I tested this conflict resolution. Change-Id: I52993c61a80bc7aee3d49ce37b88413e8f40f832		2017-06-14 11:56:25 +08:00
..
board	Accept multiple input files for device manifest.	2017-05-24 16:39:02 -07:00
product	resolve merge conflicts of a24fcf6abc to oc-dr1-dev-plus-aosp	2017-06-14 11:56:25 +08:00