Jeff Sharkey 7029a23b38 Merge "Defuse Bundles parsed by the system process." into nyc-dev am: c4b0ade ...

am: a0f6318

* commit 'a0f6318f44244ec4e916d3abecf157beb4fefc8c':
  Defuse Bundles parsed by the system process.

2016-03-17 18:54:28 +00:00

..

res

Import translations. DO NOT MERGE

2016-03-09 07:27:08 -08:00

src/com/android/providers/settings

Defuse Bundles parsed by the system process.

2016-03-16 14:45:26 -06:00

test

Revert "Enabled NetworkPolicy backup and restore."

2016-02-01 13:47:48 +00:00

Android.mk

…

AndroidManifest.xml

More file-based encryption work.

2015-11-11 10:47:23 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…