tree cc92280359f23189e26bae1e668c68d869948bbc
parent 685391c5e90b69095a11a6f3b3e0854d75e1f78b
parent 536989892c5035872b9891e888a4f0d96037ea60
author Tianjie Xu <xunchang@google.com> 1488577990 +0000
committer android-build-merger <android-build-merger@google.com> 1488577990 +0000

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

Change-Id: I457f30c36fde0dd407a9684fbc7c2d68ac2b94c0