OSDN Git Service

am 15eb5b56: (-s ours) am 474429d0: Do not merge
authorMike Reed <reed@google.com>
Tue, 26 Jan 2010 02:11:52 +0000 (18:11 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 26 Jan 2010 02:11:52 +0000 (18:11 -0800)
commitcf1c1790ae23d2a37b44f512e7351855e264f9ee
treea24c36a2e6003776f44f9fc23f17614e92202080
parent11e71b1d376c5c41baf24f737b56b82d0e814988
parent15eb5b562b10f293bc5de162075895b54400f684
am 15eb5b56: (-s ours) am 474429d0: Do not merge

Merge commit '15eb5b562b10f293bc5de162075895b54400f684'

* commit '15eb5b562b10f293bc5de162075895b54400f684':
  Do not merge