commit 9a87262a4b12e95e3849cfb9a0ba61c0b7616b8f
author Android Build Merger (Role) <android-build-merger@google.com> Thu Jun 08 22:35:02 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 08 22:35:06 2017 +0000
tree 5560e21c6e4cbc6cdacf2d368c097bb74463d50b
parent e45fb22d485ecf8f481ce8348bdf04c3427d8e53
parent 0a9e93a1b5ef00c2db43485dd6ecdaff933a29c1

Merge changes from topic 'am-c9725ed7d141479aa6dd035636746125' into oc-dr1-dev-plus-aosp

* changes:
  [DO NOT MERGE] Updating Security String to 2017-08-05 on nyc-dev bug:62388772 am: 2b93753bc4 am: 8828ffc63e am: edda32c5e3  -s ours am: af114e0286  -s ours am: 332ef64b0e  -s ours am: c56a72d5fc  -s ours am: e4f93ecc22  -s ours am: c41c875e40 am: 8e9fca1a47
  [DO NOT MERGE] Updating Security String to 2017-08-01 on nyc-dev bug:62388772 am: a847c0b23c am: c486b5d047 am: 92c1ca1f5c  -s ours am: 5cada70115  -s ours am: 525c88d2c8  -s ours am: d9109cc1c6  -s ours am: a66e843ded  -s ours am: e2f98a3f49 am: f62f9bc10f