Justin Morey 030b549314 resolved conflicts for merge of 68000907 to lmp-mr1-dev ... Change-Id: I9f1a80746a5d945c704cd126efebca0941e27e47		2015-03-18 21:29:09 -05:00
..
generic	Use fonts from generic device for the SDK.	2014-08-09 00:37:31 +00:00
generic_arm64	Bump generic_arm64 system partition size to 900M.	2014-12-10 09:56:06 -08:00
generic_armv5	Resurrect generic_armv5	2013-01-31 11:43:14 -08:00
generic_mips	Bump generic_mips and generic_x86_64 system partition size	2015-02-11 16:51:54 -08:00
generic_mips64	Change mips64 default to mips64r6 from mips64r2	2014-09-04 19:01:22 -07:00
generic_x86	am f9172a61: am 2eb95ac2: am ad6107c3: Merge "Coalesce generic_x86 and generic sepolicy where possible."	2014-06-17 18:06:10 +00:00
generic_x86_64	Bump generic_x86_64 system partition size - DO NOT MERGE	2015-03-18 21:04:14 +00:00
Android.mk	Don't bother going through the source tree	2013-08-09 10:08:30 -07:00