The Android Automerger 750ccd5333 Manually merge branch 'nyc-mr1-dev-plus-aosp' to shortcircuit automerger b/28407115

2016-04-27 22:14:50 +00:00

..

res

Import translations. DO NOT MERGE

2016-04-19 00:29:21 -07:00

src/com/android/providers/settings

Merge "Merge "Add a missing null object check" into nyc-dev am: 44cc663" into nyc-mr1-dev

2016-04-27 21:30:16 +00:00

test

Revert "Enabled NetworkPolicy backup and restore."

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

Android.mk

Rewrite of the settings provider.

2015-02-11 17:58:22 -08:00

AndroidManifest.xml

Refactoring FBE APIs based on council feedback.

2016-03-17 14:49:08 -06:00

MODULE_LICENSE_APACHE2

…

NOTICE

…