OSDN Git Service

am 8fa17c4f: (-s ours) am 79f107bd: Do not merge
authorMike Reed <reed@google.com>
Tue, 26 Jan 2010 07:34:43 +0000 (23:34 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 26 Jan 2010 07:34:43 +0000 (23:34 -0800)
commit5910edcd70fffad4bf8e3fdd7ab9fc029451985b
treea24c36a2e6003776f44f9fc23f17614e92202080
parentcf1c1790ae23d2a37b44f512e7351855e264f9ee
parent8fa17c4f225590d9dbe59b813a5054a506b3f19c
am 8fa17c4f: (-s ours) am 79f107bd: Do not merge

Merge commit '8fa17c4f225590d9dbe59b813a5054a506b3f19c'

* commit '8fa17c4f225590d9dbe59b813a5054a506b3f19c':
  Do not merge