tree 54cd9fac55839d89b411f4cfbbbe6ac35253918c
parent 7e1e1352ee3b596f4811381531ce2c513a4d90aa
parent 7c4da1ce2b7fe2dd9dcf3ce731b957525d1e646d
author Etan Cohen <etancohen@google.com> 1518055022 +0000
committer android-build-merger <android-build-merger@google.com> 1518055022 +0000

[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am: e137462b2c am: 15754b34be am: c3fc912374 am: 0c37ab30a1 am: def8c23fb5 am: 2367a1a63e am: ec3b2c4683 am: bde11f2314 am: 71bb27a3da am: ff94c32675 am: 1c490515bd
am: 7c4da1ce2b

Change-Id: I07b03c420bb55f3b5136f316fa8e58316ba5deac