OSDN Git Service

am ff53b5b9: (-s ours) am 84c2777a: (-s ours) Merge jb-mr1-dev into aosp/master ...
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 27 Nov 2012 16:26:57 +0000 (08:26 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 27 Nov 2012 16:26:57 +0000 (08:26 -0800)
commit0fa3b602db32345a0f850eb3a68331c4f2fad422
treea1aa103a3c6fa5a6aac05302ad40ac7548f9924f
parentbabe0faebe98ac4f87a7789976c958b80b797345
parentff53b5b94f900d71cffe9fe9ae40ea860e1c79e7
am ff53b5b9: (-s ours) am 84c2777a: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge

* commit 'ff53b5b94f900d71cffe9fe9ae40ea860e1c79e7':