tree a424162e4d5deff66e7df44eb95cfaf8f54bfa77
parent 9dba59da3185ff7916acb040b7e0a8f15f56bfc7
parent f5fb2a0656d21a2bcc1dd419d3bbf3dc8f11c181
author The Android Open Source Project <initial-contribution@android.com> 1350052430 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350052430 -0700

am f5fb2a06: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'f5fb2a0656d21a2bcc1dd419d3bbf3dc8f11c181':