OSDN Git Service

am cbe4f887: (-s ours) am a406fb90: DO NOT MERGE
authorGrace Kloba <klobag@google.com>
Thu, 25 Feb 2010 02:56:27 +0000 (18:56 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 25 Feb 2010 02:56:27 +0000 (18:56 -0800)
Merge commit 'cbe4f88747b56a753e4a9bf061946f4c6f051243'

* commit 'cbe4f88747b56a753e4a9bf061946f4c6f051243':
  DO NOT MERGE


Trivial merge