Dianne Hackborn 53cfedca95 am f8171e22: am e6f63800: Merge "Fix issue #7196015: system_server deadlock during setup wizard" into jb-mr1-dev ...

* commit 'f8171e229bb3036e762bc8545c99e31e1cbfef3b':
  Fix issue #7196015: system_server deadlock during setup wizard

2012-09-20 15:46:17 -07:00

..

java

am f8171e22: am e6f63800: Merge "Fix issue #7196015: system_server deadlock during setup wizard" into jb-mr1-dev

2012-09-20 15:46:17 -07:00

jni

Fix Skia assertions where we were allowing immutable bitmaps to be written to.

2012-09-19 07:21:12 -07:00

res

am ce14f217: am 3d5be42e: Merge changes I87c2ab9e,I2dafcc34,I731c96c2 into jb-mr1-dev

2012-09-20 13:00:44 -07:00

tests

Migrate network stats from removed users.

2012-09-19 14:54:05 -07:00