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
donottranslate-config-spacing-and-punctuations.xml	Suppress warnings related to string resource	2014-03-26 19:05:29 +09:00
strings-action-keys.xml	Import translations. DO NOT MERGE	2014-06-23 16:44:25 -07:00
strings-appname.xml	Import translations. DO NOT MERGE	2013-10-04 09:03:13 -07:00
strings-config-important-notice.xml	Remove string-arrays that are getting in the way	2014-03-08 22:37:27 +09:00
strings-emoji-descriptions.xml	resolved conflicts for merge of 9cd60fe1 to mnc-dev-plus-aosp	2015-07-11 01:08:28 -07:00
strings-letter-descriptions.xml	Import translations. DO NOT MERGE	2015-04-29 13:46:26 +00:00
strings-talkback-descriptions.xml	Import translations. DO NOT MERGE	2015-03-04 05:54:58 -08:00
strings.xml	Import translations. DO NOT MERGE	2015-06-03 08:18:04 -07:00