Svetoslav Ganov d24ac9abd6 Merge "Don\'t hold a lock while reading shared preferences from disk." into nyc-dev ...

am: 5350306989

* commit '53503069895918a59a305addaac84ea11937edcf':
  Don't hold a lock while reading shared preferences from disk.

2016-02-19 17:17:48 +00:00

..

java

Merge "Don\'t hold a lock while reading shared preferences from disk." into nyc-dev

2016-02-19 17:17:48 +00:00

jni

Merge "Use UTF32 directly in HarfBuzz<->Skia interface." into nyc-dev

2016-02-19 15:09:37 +00:00

res

Merge "Add android:backupInForeground" into nyc-dev

2016-02-18 21:52:24 +00:00

tests

Merge "Move tests for com.android.internal.util out of coretests" into mm-wireless-dev

2016-02-19 06:08:15 +00:00