Narayan Kamath 1194e754a9 Merge "Add support for persist.sys.locale." automerge: dca2332 ...

automerge: 117f161

* commit '117f161fee52dfa200f89282c487d58c29b41d4f':
  Add support for persist.sys.locale.

2015-01-22 13:56:01 +00:00

..

java

am 3677117d: Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev automerge: ad44f74

2015-01-22 10:32:30 +00:00

jni

Merge "Add support for persist.sys.locale." automerge: dca2332

2015-01-22 13:56:01 +00:00

res

Import translations. DO NOT MERGE

2015-01-21 08:14:22 -08:00

tests

am b5108949: am e4a031e3: Merge "New trick to install bad dex file."

2015-01-20 22:01:26 +00:00