commit d32c2a4189b9e0b116df2b97b1971e7f4bcd5f8c
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 b50ca807d0665b3b7e941d8f9768655a17c3a4d7
parent 0d4d38e3f9741a87ec7da14f7118cdcaa2c5c828
parent 7cf42221c67009e9a0fb5c6357022e53f601e8c2

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

* changes:
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53 am: 433e4173ec am: 686897ddd9
  [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