commit d687ecde657b16633426500dc2510076bb95c79e
author Android Build Merger (Role) <android-build-merger@google.com> Wed Apr 12 23:14:07 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 12 23:14:08 2017 +0000
tree dd831e259801ae6549b68f0321fa901da2594a92
parent 4ab1bf68dee29cb47289811a87ba1f48b7aedbd4
parent 8dea8281b4d409e7b7ed5b09369346d5ade4fb0b

Merge changes from topic 'am-3403dc66cfaf4ce0816e0302b52c9071' into oc-dev-plus-aosp

* changes:
  [DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b  -s ours am: 2d14a7da35  -s ours am: 2d19cbf722 am: fa8973ba33  -s ours am: 9a805d9e3e am: 47e5cb0303 am: d1174126d0 am: c4d46c791a  -s ours am: 47d4a317fa am: e966226f39 am: c37c1a540d am: 358777c4fe am: 752ff90839 am: ba4d85f4d5  -s ours
  [DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8  -s ours am: 4389a11f4b  -s ours am: 65101a958e am: 18c3da68f0  -s ours am: 988fc368d3 am: 14ef6098bb am: a34845a20c am: a73f9cf1f5  -s ours am: 3720a2f373 am: 597a5a8b14 am: 859eeaa4ad am: b1e5092b3f am: 19ef36f8ad am: 6a1fb65b94  -s ours