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