Merge "[RTT] Ranging timestamp is in millis"

author Etan Cohen <etancohen@google.com>

Sat, 17 Feb 2018 05:27:30 +0000 (05:27 +0000)

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

Sat, 17 Feb 2018 05:27:30 +0000 (05:27 +0000)
author Etan Cohen <etancohen@google.com>
Sat, 17 Feb 2018 05:27:30 +0000 (05:27 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 17 Feb 2018 05:27:30 +0000 (05:27 +0000)
diff --cc api/current.txt
Simple merge
diff --cc wifi/java/android/net/wifi/rtt/RangingResult.java
Simple merge
author	Etan Cohen <etancohen@google.com>
	Sat, 17 Feb 2018 05:27:30 +0000 (05:27 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 17 Feb 2018 05:27:30 +0000 (05:27 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
wifi/java/android/net/wifi/rtt/RangingResult.java	patch \|	diff1 \|	diff2 \|	blob \| history