Erik Kline 17ca0e43a1 Merge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b am: cbd3d8b356 am: 082263344a ...

am: 190d8591ce

Change-Id: I255691753279b370e85c4bde1930b7e2f45cd109

2017-01-12 10:49:31 +00:00

..

java/com/android/server

Merge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b am: cbd3d8b356 am: 082263344a

2017-01-12 10:49:31 +00:00

jni

Merge "Use bitfields in GNSS HAL"

2017-01-11 18:33:21 +00:00

Android.mk

resolve merge conflicts of 46c39f6c36 to master

2017-01-11 16:15:13 +00:00