commit | 233d29d6b85a994c6c237a39224e9ad3cdaec0a7 | [log] [tgz] |
---|---|---|
author | Brian Carlstrom <bdc@google.com> | Fri Oct 19 13:46:42 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 19 13:46:42 2012 -0700 |
tree | de2fbd9c698e3588f15e8dd5715bda57dabd9185 | |
parent | e65a7132f7a47d32fac1b1ba7b34a9731245d2b5 [diff] | |
parent | 5af1943e8c341c92ca11fb2b141cd0f1a0c1d105 [diff] |
am 5af1943e: Merge "Wait for threads to finish in ThreadsTest before continuing" * commit '5af1943e8c341c92ca11fb2b141cd0f1a0c1d105': Wait for threads to finish in ThreadsTest before continuing