tree e53e6deaab753b1e7430d072e2fde63d44a43936
parent 2e883a8deb6a6ade1d0c5439f186673a46918471
parent 2c3d1d83d5f28160baa5cbec782d518fa186af73
author The Android Open Source Project <initial-contribution@android.com> 1349792990 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349792990 -0700

am 2c3d1d83: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '2c3d1d83d5f28160baa5cbec782d518fa186af73':