Nicolas Prevot 3677117d2b Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev ...

automerge: ad44f74

* commit 'ad44f7448f0b9aa672cad21300f436e369c8105d':
  Never set "Work" or "Personal apps" as prefered activities.

2015-01-22 10:24:49 +00:00

..

java

Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev

2015-01-22 10:24:49 +00:00

jni

Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev

2015-01-15 23:04:15 +00:00

res

Import translations. DO NOT MERGE

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

tests

…