Baligh Uddin 2f98008d06 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

2012-09-20 15:55:06 -07:00

..

java

Merge "Multiuser awareness in content observer infrastructure" into jb-mr1-dev

2012-09-20 15:43:57 -07:00

jni

Merge "SurfaceTexture: remove call to doGLFenceWait" into jb-mr1-dev

2012-09-18 14:32:01 -07:00

res

Import translations. DO NOT MERGE

2012-09-20 15:46:33 -07:00

tests

Merge "fix broken user build: do not throw an error when in user flavor." into jb-mr1-dev

2012-09-20 15:35:00 -07:00