tree ac9388486ba097eab16c296a9faf339bd74956c1
parent 83cb35453fb981596e77e2957fe5776fc439250e
parent 8d2d052b61e88e32639dc498cebaaf836d959438
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 cw-e-dev

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