tree dd831e259801ae6549b68f0321fa901da2594a92
parent 7b6ec411c9fd24d8e522f3bb10297f69af07c1cc
parent 5540df21897a525d85975985147a08b4eefc9da5
author Android Build Merger (Role) <android-build-merger@google.com> 1492038829 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1492038830 +0000

Merge changes from topic 'am-2c607462d6a54023821ee64b103e2284' into oc-dev-plus-aosp

* changes:
  [DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev am: 70d708e29f am: 15420e5bb0 am: 49ca7ee1b0 am: 0e503efe43 am: 019c695262  -s ours am: 85ab2c9c56
  [DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev am: d9a5e99599 am: 518f3b9283 am: c347cb4986 am: 888cf4cf67 am: 17a45d4c94  -s ours am: 60660d0a17