[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4...

author Android Build Merger (Role) <noreply-android-build-merger@google.com>

Fri, 2 Feb 2018 18:16:45 +0000 (18:16 +0000)

committer Android Build Merger (Role) <noreply-android-build-merger@google.com>

Fri, 2 Feb 2018 18:16:45 +0000 (18:16 +0000)
author Android Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 2 Feb 2018 18:16:45 +0000 (18:16 +0000)
committer Android Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 2 Feb 2018 18:16:45 +0000 (18:16 +0000)
diff --cc wifi/java/android/net/wifi/RttManager.java
Simple merge
author	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Fri, 2 Feb 2018 18:16:45 +0000 (18:16 +0000)
committer	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Fri, 2 Feb 2018 18:16:45 +0000 (18:16 +0000)