Ying Wang f9cd36a0f7 resolved conflicts for merge of 56791ebe to master ... Change-Id: I7463636796f1262fd92af839102dc58d562259f7		2010-06-15 15:43:13 -07:00
..
security	remove mkkey.sh from build	2009-12-01 12:42:30 -08:00
AndroidProducts.mk	resolved conflicts for merge of 56791ebe to master	2010-06-15 15:43:13 -07:00
core.mk	am 3388f183: am 588d529e: Merge "Make Vorbis decoding through stagefright the default." into kraken	2010-05-25 14:19:17 -07:00
full.mk	Add extra IMEs in the full config	2010-04-05 11:40:20 -07:00
generic.mk	am a65ecab3: am 13a90e3a: Add SystemUI.apk to the generic build.	2010-06-02 22:41:24 -07:00
generic_x86.mk	generic.mk: Replaced AlarmClock with newer DeskClock App	2010-05-22 22:22:26 +02:00
languages_full.mk	Add separate language packs, for extra flexibility.	2010-03-26 12:12:05 -07:00
languages_small.mk	Add separate language packs, for extra flexibility.	2010-03-26 12:12:05 -07:00
large_emu_hw.mk	Add generic makefiles.	2010-04-01 13:37:59 -07:00
locales_full.mk	Make a full list of locales available, and use it for the sim build.	2010-04-26 10:49:43 -07:00
sdk.mk	am eae2720b: am 3a212f0f: am 0c5363c8: am 8e5605a7: Add QuickSearchBox to the SDK build.	2010-05-26 11:42:46 -07:00
sim.mk	Make a full list of locales available, and use it for the sim build.	2010-04-26 10:49:43 -07:00