tree d3fe460f067c6a275d7031f50d1efa3cc62a8aa2
parent fc1f308ca1d679f9e9823a848e6396a23513f2fb
parent cd9482d961d1c14b6dea7279f8524e29908b6a27
author The Android Open Source Project <initial-contribution@android.com> 1371047160 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371047160 -0700

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

* commit 'cd9482d961d1c14b6dea7279f8524e29908b6a27':