tree bebef3e8b8d9ef0842d6591508d78f58300dd5bb
parent 0bcb5d904455c930bd2d7b68a477da2fe43dbcea
parent 4124016ae5c8174aa53433894b896604ffa52c67
author The Android Open Source Project <initial-contribution@android.com> 1343771470 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343771470 -0700

am 4124016a: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '4124016ae5c8174aa53433894b896604ffa52c67':