tree b447638a77922c79fd520f03b3ddabfe5f76a21a
parent f31290439c7048efb1ff473d799aff383d21462b
parent ebb47acad489b59797a4928f710a4c72b79b2e81
author Jerry Zhang <zhangjerry@google.com> 1527655215 -0700
committer android-build-merger <android-build-merger@google.com> 1527655215 -0700

Merge "recovery: c++ify pthread use in UI" am: 85a007c47c am: 956580b139
am: ebb47acad4

Change-Id: I51071b091a91168dd05c2c4b33aa1b42c5769f97