tree 1b95606be471ed7f44a30bb80ff49ac088e4b3e4
parent 562d906f957ea7d6b76679e0ec3bc8555624b9bd
parent 4595bc7f12cadfc0ec7b1f9fe0945fd2e45fb425
author Christopher Tate <ctate@google.com> 1468547371 +0000
committer android-build-merger <android-build-merger@google.com> 1468547371 +0000

Merge \"Thread-safe pipe teardown during restore operations\" into nyc-mr1-dev
am: 4595bc7f12

Change-Id: I8c53961f93633f26615970c40d071f2e8d714780