OSDN Git Service

am 706ed7eb: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 20 May 2013 15:26:24 +0000 (08:26 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 May 2013 15:26:24 +0000 (08:26 -0700)
commita4b74463b9fca3baca7f4dbdfcfd2a1311f62974
tree7f1b2c0c222c4b6222c79530962bbf939a7531a1
parent43eab260e53a6104da9a221183a84d7d57d4f373
parent706ed7ebf21b5936b2d5b908a239be3e05160518
am 706ed7eb: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '706ed7ebf21b5936b2d5b908a239be3e05160518':