am f97103b5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:24:31 +0000 (12:24 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Nov 2012 20:24:31 +0000 (12:24 -0800)
commit29434681bcb2cf348411f790887473a41855baf8
tree84363855e22bd883dea8b56ac8418fb73017d96b
parent1273f1b7ace1772bc115f4252f2925de0c5c102d
parentf97103b5f0e5a65a81f60bbe39cd563b655ce020
am f97103b5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'f97103b5f0e5a65a81f60bbe39cd563b655ce020':