commit 8f56703634d41f42010ce92adb88bfcfafaf8995
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Feb 15 23:08:41 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 15 23:08:41 2018 +0000
tree fb4cee3511e3cb5b7c5f13a5416d51dfe9451f8a
parent e16dca56ac705221c49dfcbfbbd33ed8240dc18e
parent cf0cbca820dad9457e9d21815dd9c8cbe7d69d21

Merge changes from topic "am-21ead65d-285f-4c88-92dc-baeab6ab6ccb" into oc-dev

* changes:
  [automerger] Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r28" into lollipop-mr1-cts-dev am: 6ebd08b079  -s ours" into marshmallow-cts-dev am: ac28ed58d3  -s ours am: 4210a193c9 am: 0e04b94700 am: 7a6424005a skipped: 442f065769 am: fb5725c skipped: d563153e62
  [automerger] Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r28" into lollipop-mr1-cts-dev am: 6ebd08b079  -s ours" into marshmallow-cts-dev am: ac28ed58d3  -s ours am: 4210a193c9 am: 0e04b94700 am: 7a6424005a skipped: 442f065769 am: fb5725c am: ed69eafe6e
  [automerger] Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r28" into lollipop-mr1-cts-dev am: 6ebd08b079  -s ours" into marshmallow-cts-dev am: ac28ed58d3  -s ours am: 4210a193c9 am: 0e04b94700 am: 7a6424005a skipped: 442f065769 am: fb5725c am: 14a600a89a
  [automerger] Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r28" into lollipop-mr1-cts-dev am: 6ebd08b079  -s ours" into marshmallow-cts-dev am: ac28ed58d3  -s ours am: 4210a193c9 am: 0e04b94700 am: 7a6424005a skipped: 442f065769 am: fb5725c am: 510cf0baa9
  [automerger] Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r28" into lollipop-mr1-cts-dev am: 6ebd08b079  -s ours" into marshmallow-cts-dev am: ac28ed58d3  -s ours am: 4210a193c9 am: 0e04b94700 am: 7a6424005a skipped: 442f065769 am: fb5725cf63
  [automerger] Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r28" into lollipop-mr1-cts-dev am: 6ebd08b079  -s ours" into marshmallow-cts-dev am: ac28ed58d3  -s ours am: 4210a193c9 am: 0e04b94700 am: 7a6424005a skipped: 442f065769
  [automerger] Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r28" into lollipop-mr1-cts-dev am: 6ebd08b079  -s ours" into marshmallow-cts-dev am: ac28ed58d3  -s ours am: 4210a193c9 am: 0e04b94700 am: 7a6424005a
  [automerger] Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r28" into lollipop-mr1-cts-dev am: 6ebd08b079  -s ours" into marshmallow-cts-dev am: ac28ed58d3  -s ours am: 4210a193c9 am: 0e04b94700
  [automerger] Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r28" into lollipop-mr1-cts-dev am: 6ebd08b079  -s ours" into marshmallow-cts-dev am: ac28ed58d3  -s ours am: 4210a193c9
  Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r28" into lollipop-mr1-cts-dev am: 6ebd08b079  -s ours" into marshmallow-cts-dev am: ac28ed58d3  -s ours