tree 5b9f5c338aa81a399478f679a28fa1edc1c5aef8
parent 533ad31cc18413c0b85bff1c63f472b935b2168c
parent 00a309ab3e09ac298ee8a180cc2c9cfed85eaa8e
author Tianjie Xu <xunchang@google.com> 1493403892 +0000
committer android-build-merger <android-build-merger@google.com> 1493403892 +0000

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

Change-Id: Iac217d868ccc8a3fd90dcfb26c89d653ce066ffb