tree f5f158caa46550c9144606d3c5d90bd7b6868528
parent 0155b7e2ffd69d647c480a21af00904bea7b9ba5
parent 3522330d404640c59a3843f88ed56bc95d86750c
author The Android Open Source Project <initial-contribution@android.com> 1351700593 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351700593 -0700

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

* commit '3522330d404640c59a3843f88ed56bc95d86750c':