am 1273f1b7: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 2 Nov 2012 14:30:19 +0000 (07:30 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 2 Nov 2012 14:30:19 +0000 (07:30 -0700)
commitf62c01c0843dc6686a9add82bfcf5907a031bfb5
treed3260d11085c9cef5f259ba0b98be674b38bfc05
parenta08bbc567a2477eb292ac27153f62b165bd2bed9
parent1273f1b7ace1772bc115f4252f2925de0c5c102d
am 1273f1b7: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '1273f1b7ace1772bc115f4252f2925de0c5c102d':