Julia Reynolds 695b7e7a73 Merge changes I01afb5e9,I90d1adaf into nyc-dev ...

am: 3da3d7f4

* commit '3da3d7f455761b73309bf5a02bef5eba816df5cd':
  Add content intent to autogroup summary.
  Logging for ranker bundling.

Change-Id: Ic01693ab7568122a8b8221ba4e01f319e724c100

2016-04-19 12:55:50 +00:00

..

java/com/android/server

Merge changes I01afb5e9,I90d1adaf into nyc-dev

2016-04-19 12:55:50 +00:00

jni

Merge "Fixed bugs when deliver GnssMeasurement from N-HAL" into nyc-dev

2016-04-13 23:46:36 +00:00

Android.mk

Metrics logging for DNS queries.

2016-04-15 16:54:39 +09:00