tree cc92280359f23189e26bae1e668c68d869948bbc
parent 3d605c54e38b28ed10fe34f7cb2671e690e97844
parent b694ba8aab0e60b530beaeb079017ec2cf0ad10a
author Tianjie Xu <xunchang@google.com> 1488577809 +0000
committer android-build-merger <android-build-merger@google.com> 1488577809 +0000

Merge "Fix an error on bootloadermessager test teardown"
am: b694ba8aab

Change-Id: I9e32f0468e4d5fb22190d9c64b2804666d8202fb