OSDN Git Service

Merge "Fix a deadlock I ran into." into gingerbread
authorDianne Hackborn <hackbod@google.com>
Thu, 23 Sep 2010 21:15:45 +0000 (14:15 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 23 Sep 2010 21:15:45 +0000 (14:15 -0700)

Trivial merge