commit 78bacb406120ba614050feb53999799625633d05
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Sep 06 01:29:28 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 06 01:29:28 2018 +0000
tree ae5fff0621c1236bc54838879c0bbe9c5a9eff89
parent de95cfe1b2fa99457f317eb486c56e7d13d7ae5b
parent 686897ddd9b819b4e9ca440bedb93f1091b65b9a

Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into nyc-mr2-dev

* changes:
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53 am: 433e4173ec
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3
  Verify number of Map entries written to Parcel