sergeyv 9ee408d37e Merge "DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB" into nyc-dev ...

am: c015719

* commit 'c015719954d9a1c0a53f277f68405401207a0c65':
  DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB

Change-Id: I28bec4d86b0e5a29f9c09a766456788b1ae6a808

2016-04-26 21:44:50 +00:00

..

java

Merge "DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB" into nyc-dev

2016-04-26 21:39:43 +00:00

jni

Merge "Improve SurfaceView postion snapping" into nyc-dev

2016-04-26 20:20:39 +00:00

res

Merge "Add back protected profile availibility broadcasts." into nyc-dev

2016-04-25 18:09:34 +00:00

tests

Merge "Ensure local settings caches are not stale" into nyc-dev

2016-04-26 18:36:28 +00:00