am 4ed896ce: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:22:27 +0000 (09:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 31 Oct 2012 16:22:27 +0000 (09:22 -0700)
* commit '4ed896ce6a2e53de38d6d00fbe8750e48b2925ff':


Trivial merge