OSDN Git Service

am d7630634: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 20 May 2013 15:22:40 +0000 (08:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 May 2013 15:22:40 +0000 (08:22 -0700)
commit2a00d1fa9948603d5283fed3152291dab1adcb59
tree3b76d5e38e37ca9f59c689bfb6aef11a75a35249
parent308bcaa44e578279e61be32b572fdb0b11b1e4c7
parentd76306343048d1e16ba92e9eb8f024ad5dfe769d
am d7630634: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'd76306343048d1e16ba92e9eb8f024ad5dfe769d':