tree 3f11f2441d130597f029c9ac215b9d7da7f6edca
parent 8985b7b890aa7e84effe44ac11989c6158767f0d
parent fd363b27e87ad4b9dc23bcd415d3d9fb5619cdfb
author Angus Kong <shkong@google.com> 1364857996 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1364857996 +0000

Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce