Guang Zhu fb3083ef6f am 96d9fa29: resolved conflicts for merge of ef1335ed to jb-dev-plus-aosp ... * commit '96d9fa29cd1ff48b733eb090e99fe165d194d313': use default shell (mksh) in emulator		2012-07-12 09:36:35 -07:00
..
emulator	Delete the tuttle keymaps.	2010-11-23 16:48:26 -08:00
generic	resolved conflicts for merge of ef1335ed to jb-dev-plus-aosp	2012-07-11 19:36:17 -07:00
generic_mips	replace development/data/etc/ to device/generic/goldfish/data/etc	2012-06-19 18:02:22 -07:00
generic_x86	resolved conflicts for merge of ef1335ed to jb-dev-plus-aosp	2012-07-11 19:36:17 -07:00
vbox_x86	am 15d15136: Merge "change location of apns-conf.xml and vold.conf" into jb-dev	2012-05-30 20:34:00 -07:00
Android.mk	optional cross-check between OTA radio images and board-info.txt	2012-03-21 09:18:15 -07:00