John Reck 91249ce452 am cfe353ba: am b6610d82: Merge "Fix DPI scaling on TVDPI" into jb-mr1-dev ...

* commit 'cfe353bad0e5daed9f2166ce37973f2a6b3d9c54':
  Fix DPI scaling on TVDPI

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

..

java

am cfe353ba: am b6610d82: Merge "Fix DPI scaling on TVDPI" into jb-mr1-dev

2012-09-20 13:00:47 -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