SzuWei Lin 0ab6b24e07 resolve merge conflicts of 40ef25d7bd to stage-aosp-master ... Test: I solemnly swear I tested this conflict resolution. Change-Id: I39cf0099b857d38222a81c7be41ec13cebb1fb7a		2017-09-29 15:51:45 +08:00
..
board	Merge "get kernel configs from kernel/configs"	2017-09-13 21:08:28 +00:00
product	resolve merge conflicts of 40ef25d7bd to stage-aosp-master	2017-09-29 15:51:45 +08:00
Android.mk	Remove the need to find Android.mk files via directory symlinks	2017-08-07 14:21:20 -07:00