Jim Miller 126a026393 Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev am: 4401e24add ...

am: 2cf5b73c0a

Change-Id: Ie2c8adbeefaab6f9fa1ff6802d938e31be065b84

2016-06-08 00:45:35 +00:00

..

java

Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev am: 4401e24add

2016-06-08 00:45:35 +00:00

jni

Merge "Copy native tree\'s property when mutate vector drawable" into nyc-dev

2016-05-27 22:22:14 +00:00

res

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

2016-06-07 02:22:18 +00:00

tests

Merge \"Fix build break by adding missing parenthesis.\" into nyc-mr1-dev

2016-06-07 23:47:39 +00:00