OSDN Git Service

am b3b7197c: (-s ours) am 92a9a3c5: Merge "Do not merge." into honeycomb
authorPatrick Scott <phanna@android.com>
Wed, 12 Jan 2011 17:48:46 +0000 (09:48 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Jan 2011 17:48:46 +0000 (09:48 -0800)
commit02b506ef15722e883ae17292ac423aa38decf15e
tree0ef8946de9dbdabcf6371f3334ee093ed0bf9465
parent51bd7159955cd415f49470a8c7c7cb028684ed58
parent620f5da650528285d6b065034d4059761acd26ad
am b3b7197c: (-s ours) am 92a9a3c5: Merge "Do not merge." into honeycomb

* commit 'b3b7197cd47f2f0df733c11c919df1e4160bdaf9':
  Do not merge.