OSDN Git Service

am dbf68aa3: (-s ours) am 54a4a66d: am 9ae9763b: (-s ours) Merge change Ib097fbbf...
authorRobert Greenwalt <robdroid@android.com>
Tue, 8 Dec 2009 22:50:31 +0000 (14:50 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Dec 2009 22:50:31 +0000 (14:50 -0800)
Merge commit 'dbf68aa372078f4f55a267e1eb182dd360384467'

* commit 'dbf68aa372078f4f55a267e1eb182dd360384467':
  DO NOT MERGE  Reverting change I53e91db7.


Trivial merge