tree 06ed0844639cab83eb1987181aed5a8c8be82024
parent 713a07c3bd7c937ce5b98db721e5d8ba01f4ccac
parent af53ef23082a4b559c1f7c962a0a0323fb5030ff
author Android Build Merger (Role) <android-build-merger@google.com> 1464822995 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464822997 +0000

Merge "Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev am: 7fe19060cf am: 815c681f42" into nyc-mr1-dev-plus-aosp