tree e8e10151527d2c1106b65196e8e7502ebfe920d2
parent 37888d30537c2299ef5784fe015d2c1f3ee61181
parent c25ce30eb43cf0e09a61c08d79683b852e633d22
author Adam Seaton <aseaton@google.com> 1526506484 -0700
committer android-build-merger <android-build-merger@google.com> 1526506484 -0700

[automerger skipped] DO NOT MERGE: Updating security string for oc-mr1-dev to 2018-06-05 am: 85a18252b7  -s ours
am: c25ce30eb4

Change-Id: Ia6aef294034d4d0c61b5e7768865dac3134dc448