am b04853d0: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do...
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Oct 2012 14:43:01 +0000 (07:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Oct 2012 14:43:01 +0000 (07:43 -0700)
* commit 'b04853d02d28d726088cc3a17e8494d72b94832d':


Trivial merge