tree b447638a77922c79fd520f03b3ddabfe5f76a21a
parent 1b55de658e650cd9f29dbd0f040b923ccd129645
parent 956580b139a9ab5bb3feabbd44103be4232ed19e
author Jerry Zhang <zhangjerry@google.com> 1527648249 -0700
committer android-build-merger <android-build-merger@google.com> 1527648249 -0700

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

Change-Id: Ia3f1bad7a6c0e13a5d6920a4f43224e75b954800