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)
* commit '29434681bcb2cf348411f790887473a41855baf8':


Trivial merge