Antonio Cansado 43f0bd6e60 Merge \"Fix infinite loop when registering data usage callback.\" into nyc-dev ...

am: c20ffc2a9e

Change-Id: I3839e516a128befbfe677b17b05a557b9e0afd87

2016-06-20 22:29:45 +00:00

..

java

Merge \"Fix infinite loop when registering data usage callback.\" into nyc-dev

2016-06-20 22:29:45 +00:00

jni

DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it

2016-06-17 20:26:10 +00:00

res

Merge "Enable tap-to-pulse only when needed" into nyc-mr1-dev

2016-06-20 18:23:18 +00:00

tests

Update enable/disable code to reduce flakiness

2016-06-08 14:14:37 -07:00