Paul Lawrence 3cb05abdb2 Merge "Add API to IMountService to get encryption state" into nyc-dev ...

am: d5a3f3df40

* commit 'd5a3f3df4097e4a57e0d31fba994c91d8996abf8':
  Add API to IMountService to get encryption state

2016-03-09 13:48:43 +00:00

..

java

Merge "Add API to IMountService to get encryption state" into nyc-dev

2016-03-09 13:48:43 +00:00

jni

Merge "API to query which cores are exclusively assigned." into nyc-dev

2016-03-09 10:31:03 +00:00

res

Import translations. DO NOT MERGE

2016-03-09 08:22:39 -05:00

tests

Merge "frameworks/base: Remove unnecessary core-tests dependency" into nyc-dev

2016-03-09 07:25:44 +00:00