OSDN Git Service

am b869c594: (-s ours) am 17b14bd3: DO NOT MERGE
authorGrace Kloba <klobag@google.com>
Fri, 22 Jan 2010 01:57:29 +0000 (17:57 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 Jan 2010 01:57:29 +0000 (17:57 -0800)
Merge commit 'b869c594465d29e96fb841b48c638ddee232bbd7'

* commit 'b869c594465d29e96fb841b48c638ddee232bbd7':
  DO NOT MERGE


Trivial merge