Baligh Uddin 6afac8f980 Merge "Import translations. DO NOT MERGE"

2012-10-23 11:05:34 -07:00

..

java

am 2635e743: am d04fe3c1: am 04c8d402: Merge "Properly draw the window background on window resize Bug #7385090" into jb-mr1-dev

2012-10-23 10:58:12 -07:00

jni

am 85c1aef9: am 6534dd02: am 74261d84: Merge "Don\'t null the reference to Bitmap pixels until we\'re really ready" into jb-mr1-dev

2012-10-22 15:55:08 -07:00

res

am 7fcea3ee: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

2012-10-23 10:42:15 -07:00

tests

am 9396f183: resolved conflicts for merge of a5d29b2c to jb-mr1-dev-plus-aosp

2012-10-19 17:20:03 -07:00