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

am: 1d4fd3ed27

Change-Id: I5140373d930726e0b93fa62ac03315a37c581b5b

2016-06-20 22:44:51 +00:00

..

java

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

2016-06-20 22:44:51 +00:00

jni

…

res

Merge \"Merge \\"Enable tap-to-pulse only when needed\\" into nyc-mr1-dev am: d94a40f46d\" into nyc-mr1-dev-plus-aosp

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

tests

…