OSDN Git Service

am bfcc13fc: (-s ours) am 0a3f01ac: Merge "DO NOT MERGE" into eclair-mr2
authorGrace Kloba <klobag@google.com>
Thu, 21 Jan 2010 03:15:33 +0000 (19:15 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 Jan 2010 03:15:33 +0000 (19:15 -0800)
commit1f8453220b6154c7e7749fe3342f489b295bee96
tree910bfc85bd62b1a1a88a1b29af6be1ee9473c490
parente141ee90daef27cdf0281458ad6653cb8acc9f91
parentbfcc13fc3ee6845e9f78ca7c5313d483c9fd56c9
am bfcc13fc: (-s ours) am 0a3f01ac: Merge "DO NOT MERGE" into eclair-mr2

Merge commit 'bfcc13fc3ee6845e9f78ca7c5313d483c9fd56c9'

* commit 'bfcc13fc3ee6845e9f78ca7c5313d483c9fd56c9':
  DO NOT MERGE