OSDN Git Service

am bd255459: am c6275f58: am ce78b026: Merge "Fix deadlock." into jb-mr1-dev
authorJeff Brown <jeffbrown@google.com>
Sat, 27 Oct 2012 01:13:24 +0000 (18:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 27 Oct 2012 01:13:24 +0000 (18:13 -0700)
* commit 'bd25545961ea7ac14b92bbf5fe151b09c2e7e12f':


Trivial merge