Steve Moyer 97f49221ad Merge "DO NOT MERGE: Combine emulator test projects into a single apk" into stage-aosp-master		2014-06-17 04:56:28 +00:00
..
board	Coalesce generic_x86 and generic sepolicy where possible.	2014-06-17 09:35:56 -04:00
product	Merge "DO NOT MERGE: Combine emulator test projects into a single apk" into stage-aosp-master	2014-06-17 04:56:28 +00:00