OSDN Git Service

am 9980043e: am 820caf7b: am 8821ba86: Ummm... f*, stop breaking the build.
authorDianne Hackborn <hackbod@google.com>
Fri, 10 Jun 2011 20:00:41 +0000 (13:00 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Jun 2011 20:00:41 +0000 (13:00 -0700)
* commit '9980043e930f877c4cd066de2b3d57dce4fc926e':
  Ummm...  f*, stop breaking the build.


Trivial merge