tree f0b323dea4dedf873d11051f2e398970b37b1fb6
parent 9b514530a617b650315d0c44b31720f9f0b1a875
parent 158657bc5ce438d3cf1f601255896b854fd49103
author Jean-Baptiste Queru <jbq@google.com> 1261439237 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1261439237 -0800

am 158657bc: merge from open-source master

Merge commit '158657bc5ce438d3cf1f601255896b854fd49103'

* commit '158657bc5ce438d3cf1f601255896b854fd49103':
  Security: Fix typo in recovery EOCD detection.