tree bcffc54eb0aa634dffa1c84f52e94cbc7d5c5280
parent 0231bc4d6d84fa15da301cfd72e456b4f5a1a0fe
parent 5f4d9350f45d4f952debabcd48da5ddd8a9eb190
author Etan Cohen <etancohen@google.com> 1518043286 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1518043286 +0000

Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev

* changes:
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c
  [RTT] ParcelableRttResults parcel code fix