Antonio Cansado 1d4fd3ed27 Merge \\"Fix infinite loop when registering data usage callback.\\" into nyc-dev am: c20ffc2a9e ...

am: 13cf0e7d54

Change-Id: Idb7a28cf53e4c1b963df2dc0aff8de47d9ca8069

2016-06-20 22:36:49 +00:00

..

java

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

2016-06-20 22:36:49 +00:00

jni

Merge \"DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it\" into nyc-dev

2016-06-18 02:14:29 +00:00

res

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

2016-06-20 18:27:54 +00:00

tests

Merge \"Update enable/disable code to reduce flakiness\" into nyc-mr1-dev

2016-06-08 23:33:47 +00:00