OSDN Git Service

am 8e56e1f3: am cbcf8259: am cdec187a: Merge "Whoops, need to acquire lock." into...
authorDianne Hackborn <hackbod@google.com>
Wed, 16 Nov 2011 03:46:38 +0000 (19:46 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Nov 2011 03:46:38 +0000 (19:46 -0800)
* commit '8e56e1f3459703a9b9f5a13676428eeda68bb73f':
  Whoops, need to acquire lock.


Trivial merge