Amith Yamasani c6b85035b4 Merge \"Include new constant for encryption status in the getter\'s javadoc\" into nyc-dev ...

am: e278cf7665

Change-Id: Idd28d2ca2f46e8745392b5194dd2c8c370213ff7

2016-07-12 17:47:05 +00:00

..

java

Merge \"Include new constant for encryption status in the getter\'s javadoc\" into nyc-dev

2016-07-12 17:47:05 +00:00

jni

Merge \"Remove FD from the right Looper\" into nyc-dev

2016-06-23 18:39:44 +00:00

res

Import translations. DO NOT MERGE

2016-07-11 23:04:28 -07:00

tests

Merge \"Update DisplayMetrics when resizing\" into nyc-dev

2016-06-24 23:42:34 +00:00