tree a4e930abd2479fe1f8b143e0b624e7e43950ef4f
parent d77312bbaa86c68f9f43a68b2786e8875769d3c4
parent e6105c26a5b506f96e9fe1d3fec64a8b2ed1d6dd
author The Android Open Source Project <initial-contribution@android.com> 1371841100 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371841100 -0700

am e6105c26: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit 'e6105c26a5b506f96e9fe1d3fec64a8b2ed1d6dd':