Elliott Hughes c3bc1b671e am c255800f: am 6d82f86f: Merge "Show CJK dates as all-numeric in the DatePicker." ...

* commit 'c255800fb0f46ea5f68d2c145605ac7dcd3a89b6':
  Show CJK dates as all-numeric in the DatePicker.

2013-05-01 14:56:59 -07:00

..

java

am c255800f: am 6d82f86f: Merge "Show CJK dates as all-numeric in the DatePicker."

2013-05-01 14:56:59 -07:00

jni

am 0b30ad53: am 09f3cc2b: Merge "Fix GLES30 JNI registration" into jb-mr2-dev

2013-04-30 19:38:14 -07:00

res

Import translations. DO NOT MERGE

2013-04-29 22:34:34 -07:00

tests

resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp

2013-04-29 23:09:03 -07:00