Hemal Patel ac0b242755 resolve merge conflicts of a544221 to nyc-dev-plus-aosp ...

am: 309813c8af

Change-Id: Ia316e53bf0fd163da67676acfd52d3e31d9e2149

2016-08-26 00:42:38 +00:00

..

java

resolve merge conflicts of a544221 to nyc-dev-plus-aosp

2016-08-26 00:42:38 +00:00

jni

Merge changes from topic 'utf' am: 0a357a1a73 am: de8a6a66f6

2016-08-25 20:31:31 +00:00

res

Support notifying network switches via notifications and toasts. am: 5526f9c78c am: 4549d8b4aa

2016-08-25 09:36:13 +00:00

tests

SamplingTimer: Fix issue with summary recording too much am: 9edd6be542

2016-08-13 00:59:35 +00:00