Merge "GNSS Model Name constant string and comment updates" into pi-dev

author Wyatt Riley <wyattriley@google.com>

Thu, 22 Mar 2018 16:10:08 +0000 (16:10 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 22 Mar 2018 16:10:08 +0000 (16:10 +0000)
author Wyatt Riley <wyattriley@google.com>
Thu, 22 Mar 2018 16:10:08 +0000 (16:10 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 22 Mar 2018 16:10:08 +0000 (16:10 +0000)
diff --cc api/current.txt
Simple merge
diff --cc location/java/android/location/LocationManager.java
Simple merge
diff --cc services/core/java/com/android/server/LocationManagerService.java
Simple merge
diff --cc services/core/java/com/android/server/location/GnssLocationProvider.java
Simple merge
author	Wyatt Riley <wyattriley@google.com>
	Thu, 22 Mar 2018 16:10:08 +0000 (16:10 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 22 Mar 2018 16:10:08 +0000 (16:10 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
location/java/android/location/LocationManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/LocationManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/location/GnssLocationProvider.java	patch \|	diff1 \|	diff2 \|	blob \| history