Jeff Sharkey 04a34b3755 Merge "Actually move to Global settings." into jb-mr1-dev

2012-09-14 13:49:24 -07:00

..

java

Merge "Actually move to Global settings." into jb-mr1-dev

2012-09-14 13:49:24 -07:00

jni

am e5905684: am eceb3171: am f4afc401: Merge "framework: fix bug for uninitialized variable"

2012-09-14 12:19:03 -07:00

res

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

2012-09-13 21:58:41 -07:00

tests

Fix Settings writes to a different user

2012-09-13 19:15:54 -07:00