Merge "Use ICU's CLDR data for "AM" and "PM" strings." into jb-mr1-dev

author Elliott Hughes <enh@google.com>

Sat, 15 Sep 2012 01:55:27 +0000 (18:55 -0700)

committer Android (Google) Code Review <android-gerrit@google.com>

Sat, 15 Sep 2012 01:56:15 +0000 (18:56 -0700)
author Elliott Hughes <enh@google.com>
Sat, 15 Sep 2012 01:55:27 +0000 (18:55 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 15 Sep 2012 01:56:15 +0000 (18:56 -0700)
diff --cc core/res/res/values-fa/donottranslate-cldr.xml
Simple merge
author	Elliott Hughes <enh@google.com>
	Sat, 15 Sep 2012 01:55:27 +0000 (18:55 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 15 Sep 2012 01:56:15 +0000 (18:56 -0700)