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)
commitb4ed1835d9ef3c01711e90fe5f1f1483f00b04c4
treee11745df9701d8320b05e34a6ada8a66d196e23f
parent583e6c789edae1a762afbdfb1f5ccc5ed28ed326
parent4ed896ce6a2e53de38d6d00fbe8750e48b2925ff
am 4ed896ce: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '4ed896ce6a2e53de38d6d00fbe8750e48b2925ff':