tree 5848ca7b5d19eb95dc3cbfa2fe6361388aa2d566
parent b466e1f13558afa7052d965b69825b90aef4f977
parent b2dfc0182a52bb92e3b27007b848fda45c5cc68d
author Tianjie Xu <xunchang@google.com> 1488578170 +0000
committer android-build-merger <android-build-merger@google.com> 1488578170 +0000

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

Change-Id: Ie4ee06310e7ea9c36e5323f4990f71f2f8fb771e