am 29434681: (-s ours) am f97103b5: Reconcile with jb-mr1-factory-release jb-mr1...
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:27:31 +0000 (12:27 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Nov 2012 20:27:31 +0000 (12:27 -0800)
commit9ab4ab6bde23cea698b9b11477a6e8b659f1def2
treed3260d11085c9cef5f259ba0b98be674b38bfc05
parentf62c01c0843dc6686a9add82bfcf5907a031bfb5
parent29434681bcb2cf348411f790887473a41855baf8
am 29434681: (-s ours) am f97103b5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '29434681bcb2cf348411f790887473a41855baf8':