OSDN Git Service

am 69717ccd: DO NOT MERGE. Some stuff that is Not Ready.
authorDianne Hackborn <hackbod@google.com>
Fri, 3 Sep 2010 22:23:46 +0000 (15:23 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 3 Sep 2010 22:23:46 +0000 (15:23 -0700)
Merge commit '69717ccd13bb5568b912701ab39d603cfa7091cc' into gingerbread-plus-aosp

* commit '69717ccd13bb5568b912701ab39d603cfa7091cc':
  DO NOT MERGE.  Some stuff that is Not Ready.


Trivial merge