tree cc2461238e706d03a7db7b8e4b1974f56191ffc2
parent be566cb5705996590b3f4e797f211aa5695d61b4
parent 005f783fa0d24f98e39c7fcc34365046dd14d852
author Svetoslav Ganov <svetoslavganov@google.com> 1298666753 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1298666753 -0800

am dc365a36: Merge "resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp" into honeycomb-plus-aosp

* commit 'dc365a36dac50bccc1411c37839513daec56d335':
  Use different version of CLDR data in DatePicker