tree ea51b3082356a4111a0cb3c1ca0337375d4f3771
parent 964b0a76ae499b4f63df9f5cfcfc17e5b06bb2d7
parent 62e48ce1a4eb82ad7a00c716ad5b857b77f6ae9f
author Adam Seaton <aseaton@google.com> 1523998135 -0700
committer android-build-merger <android-build-merger@google.com> 1523998135 -0700

Merge "Update security string to 2018-05-05 on pi-dev Bug: 74345861" into pi-dev
am: 62e48ce1a4

Change-Id: I47189cbdecc76011436194d17c5d731d8f1358a3