tree f8642118f31bc6564dddb7422c673a66fa61b5bd
parent 9b83c95e4c5b7d1a541e68d845348bae6adef7a3
parent 5ea382d2080a5854ac9c8397e27d2b895e520470
author The Android Open Source Project <initial-contribution@android.com> 1348817575 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348817575 -0700

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

* commit '5ea382d2080a5854ac9c8397e27d2b895e520470':