Phil Weaver 0f82a5f261 Merge "Fix a race in settings update." into nyc-dev am: df15e03ed0 am: d56cd1fcab ...

am: f383e56846

* commit 'f383e56846057e968093bff2b4a1a5d157a7441e':
  Fix a race in settings update.

Change-Id: I7c683987f51f2b90d1cf3a566c62b18c6606ab2d

2016-05-12 16:58:47 +00:00

..

res

Import translations. DO NOT MERGE

2016-05-03 16:36:29 -07:00

src/com/android/providers/settings

Merge "Fix a race in settings update." into nyc-dev am: df15e03ed0

2016-05-12 16:56:14 +00:00

test

Revert "Persist settings on a dedicated background thread"

2016-05-10 07:02:42 +00:00

Android.mk

…

AndroidManifest.xml

…

MODULE_LICENSE_APACHE2

…

NOTICE

…