tree eb6b23cff810970054064862da2d14f98f1320f6
parent e760c7d21d95464e2bee9ec546b708df5e06e2fe
parent c8a5ea665182c454d1e4889b8c2727750383e9d6
author The Android Open Source Project <initial-contribution@android.com> 1351781682 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351781682 -0700

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

* commit 'c8a5ea665182c454d1e4889b8c2727750383e9d6':