John Reck 9f8ec54244 Fix merge for OnDrawListener ...

Test: CTS tests for PixelCopy pass; without this
they time out as they never get the OnDraw call.

Change-Id: I6acced4699182b969f38a606a1314b2ffb38d760

2016-12-12 11:23:05 -08:00

..

android

Fix merge for OnDrawListener

2016-12-12 11:23:05 -08:00

com

Merge "Allow system_server to measure emulated stats."

2016-12-02 22:42:13 +00:00

org/apache/http

…

jarjar-rules.txt

…

overview.html

…