OSDN Git Service

am 11dd4b99: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Nov 2012 20:44:56 +0000 (12:44 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 Nov 2012 20:44:56 +0000 (12:44 -0800)
commit42d44e3d5280544f42e58b11de13f44c72411f59
treecd9d04a8fe592e44153728e07d1f7eba1136cd89
parentf1c3ffe5f0cbf33041cfa9c3d6333ee08fbf2802
parent11dd4b998dfadf5a7eeaec5228cfb6100c855608
am 11dd4b99: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '11dd4b998dfadf5a7eeaec5228cfb6100c855608':