tree 09627f85c733f844af02daed570a8c3a35ff1087
parent 8147a6ddfd54079ef89f90bf2b5ed3ab6f59bbc0
parent 05e87d536ed2b7cf1d68135121b630031e5d56c2
author The Android Open Source Project <initial-contribution@android.com> 1371393934 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371393934 -0700

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

* commit '05e87d536ed2b7cf1d68135121b630031e5d56c2':