Mitchell Wills e8bab3cd37 Merge "Remove AsyncChannelTest because it does not test anything" into mm-wireless-dev ...

am: acd97e2e0f

* commit 'acd97e2e0fdcc50f20bc4836188e781583b10f1e':
  Remove AsyncChannelTest because it does not test anything

2016-02-19 18:19:27 +00:00

..

java

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

2016-02-19 17:12:40 +00:00

jni

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

2016-02-19 15:03:48 +00:00

res

Add android:backupInForeground

2016-02-18 20:47:36 +00:00

tests

Merge "Remove AsyncChannelTest because it does not test anything" into mm-wireless-dev

2016-02-19 18:19:27 +00:00