Jatin Matani 5abefbb8d6 resolved conflicts for merge of 9cd60fe1 to mnc-dev-plus-aosp ... Change-Id: I1aad861d711170ab3dab0019d8e4ff02f058c423		2015-07-11 01:08:28 -07:00
..
bools.xml	Mark isDefault="true" for all supported subtypes	2014-09-08 18:14:51 +09:00
strings-action-keys.xml	Import translations. DO NOT MERGE	2014-12-15 21:46:42 -08:00
strings-appname.xml	Import translations. DO NOT MERGE	2014-12-15 21:48:08 -08:00
strings-config-important-notice.xml	Import translations. DO NOT MERGE	2014-12-15 21:46:04 -08:00
strings-emoji-descriptions.xml	Import translations. DO NOT MERGE	2014-12-15 21:45:29 -08:00
strings-letter-descriptions.xml	Import translations. DO NOT MERGE	2014-12-15 21:44:23 -08:00
strings-talkback-descriptions.xml	Import translations. DO NOT MERGE	2015-03-04 05:54:58 -08:00
strings.xml	resolved conflicts for merge of 9cd60fe1 to mnc-dev-plus-aosp	2015-07-11 01:08:28 -07:00