Julia Reynolds de937ecbc1 Merge changes I6b52e378,I1699e6bf into nyc-dev ...

am: 8a46d52

* commit '8a46d523042ee5d57a743ed216d8fdff7e201e33':
  Phone call vibrate should obey user preference.
  Adjustment bundles are defusable.

Change-Id: Ia59a50204742614d406848a01a06970bbf9360c2

2016-04-14 14:49:43 +00:00

..

java/com/android/server

Merge changes I6b52e378,I1699e6bf into nyc-dev

2016-04-14 14:49:43 +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

…