tree 070034cd066c6582236130e04def570dce817493
parent 7b385fb7386387aaf1a7ce524ffd50df359c18a5
parent 711e8b649d701f439ce6ce835b86efedb3040f89
author Tianjie Xu <xunchang@google.com> 1493404283 +0000
committer android-build-merger <android-build-merger@google.com> 1493404283 +0000

Merge "Fix potential OOM in update_verifier" am: 5443072c3c am: 00a309ab3e
am: 711e8b649d

Change-Id: Idf8b683ed3597063637af7f73c11c9cd3672b3f6