tree f625cd63dfee6d2a1fe62d33e79f6af80542838f
parent 015604ff1d27f810574393a16a0751bb4924ee1e
parent 0455c300353b7f5b651491e94bb9e38efe5fa0db
author Chris Tate <ctate@android.com> 1480719778 +0000
committer android-build-merger <android-build-merger@google.com> 1480719778 +0000

Merge "Fix the deadlock problem" am: fa228e06f6 am: e8c0e1098e am: 35b99da33a
am: 0455c30035

Change-Id: Ib08f8deadfe6085d6d4368527892c799c42f0757