tree 33bd9a62540777dda99983461fcb3d78003abc97
parent 011c1c88a7e0d86497fc15c6dfe0313645eada28
parent 36e3388bdcb89d7e996d2474b8d4241c791473f0
author Tianjie Xu <xunchang@google.com> 1493405558 +0000
committer android-build-merger <android-build-merger@google.com> 1493405558 +0000

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

Change-Id: Id6fe72a2599cc4c9ceafcccd26b8ed31e3c43046