Baligh Uddin b7ac4cbe50 am 2171fa1c: am 0fa4cf5b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev ...

* commit '2171fa1cd3be23fba4d3be077ff0cd6521762107':

2012-10-29 12:46:00 -07:00

..

java

am 848a5557: Merge "Fix up GlowPadView attributes" into jb-mr1-lockscreen-dev

2012-10-29 12:45:13 -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

am 2171fa1c: am 0fa4cf5b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

2012-10-29 12:46:00 -07:00

tests

Robustly add symlink and add for non-primary users

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