Baligh Uddin 94a69e3458 am a68aa4e3: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev ...

* commit 'a68aa4e34357eccd7af4d7e29e574b6bc9c61d66':
  Import translations. DO NOT MERGE

2012-10-31 16:27:56 -07:00

..

java

am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev

2012-10-30 18:07:43 -07:00

jni

am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev

2012-10-23 15:24:29 -07:00

res

Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

2012-10-31 15:31:34 -07:00

tests

Robustly add symlink and add for non-primary users

2012-10-18 15:12:09 -07:00