The Android Automerger 8bdf39e19c Manually merge branch 'nyc-mr1-dev-plus-aosp' to fix automerger blockage b/28407115

2016-04-27 17:58:24 +00:00

..

res

Import translations. DO NOT MERGE

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

src/com/android/providers/settings

Fix unexpected null check condition flipping. am: 6e5b602

2016-04-27 07:59:05 +00:00

test

…

Android.mk

…

AndroidManifest.xml

Refactoring FBE APIs based on council feedback.

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

MODULE_LICENSE_APACHE2

…

NOTICE

…