Ian Pedowitz 58251fe44d resolved conflicts for merge of 87eb4007 to mnc-dr-dev-plus-aosp ... Change-Id: I7cf9b0153457f9cfba93966db78e0c04b5d216aa		2015-08-11 15:41:19 -07:00
..
generic	resolved conflicts for merge of 87eb4007 to mnc-dr-dev-plus-aosp	2015-08-11 15:41:19 -07:00
generic_arm64	Increasing arm(64)? emulator partition sizes to 1.5GB	2015-08-11 12:53:39 -07:00
generic_armv5	Remove ARCH_ARM_HAVE_TLS_REGISTER.	2015-02-13 20:51:12 -08:00
generic_mips	Drop BOARD_SEPOLICY_UNION.	2015-04-01 10:33:24 -04:00
generic_mips64	Define BOARD_SEPOLICY_DIRS for 64-bit emulators.	2015-05-11 10:46:51 -07:00
generic_x86	Increasing x86 emulator system partition size	2015-08-11 03:39:34 +00:00
generic_x86_64	Bump x86_64 system image size to fix build	2015-05-26 10:40:36 -07:00
Android.mk	Don't bother going through the source tree	2013-08-09 10:08:30 -07:00