commit 1645ac05102083d06029328cee37ff10a2301911
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Jul 12 01:05:26 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 12 01:05:26 2018 +0000
tree dc2f79f51afd47b4ce63204c236a4551d457eed9
parent a906f483f43606b2e28a1b97206fb8abd13e3b46
parent 5ada2f3a1e3253e8ff63107d5aa0d5ec6d7b18a7

Merge changes from topic "am-8201b7d7-8db5-4163-b793-a3b653bfd601" into cw-f-dev

* changes:
  [automerger skipped] Merge "[automerger skipped] Merge "Remove testSecurityPatchDate as it is in GTS now." into marshmallow-cts-dev am: 6d743a4383  -s ours" into nougat-cts-dev am: 17fbc64377  -s ours skipped: dea306cf4f skipped: a9b7ea5690 skipped: cd2ec18864
  [automerger skipped] Merge "[automerger skipped] Merge "Remove testSecurityPatchDate as it is in GTS now." into marshmallow-cts-dev am: 6d743a4383  -s ours" into nougat-cts-dev am: 17fbc64377  -s ours skipped: dea306cf4f skipped: a9b7ea5690
  [automerger skipped] Merge "[automerger skipped] Merge "Remove testSecurityPatchDate as it is in GTS now." into marshmallow-cts-dev am: 6d743a4383  -s ours" into nougat-cts-dev am: 17fbc64377  -s ours skipped: dea306cf4f
  Merge "[automerger skipped] Merge "Remove testSecurityPatchDate as it is in GTS now." into marshmallow-cts-dev am: 6d743a4383  -s ours" into nougat-cts-dev am: 17fbc64377  -s ours