tree ea785fca1dfeae5cefb238b9d7c1420476b21914
parent 24a5a7c30ad041971ca511f4c7f784936090dfc6
parent 787bdb33f6cdffd810dd243eedfbc0aed2c0abed
author Nick Kralevich <nnk@google.com> 1405370760 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405370760 +0000

am 787bdb33: Merge "Fix Externally reported security issue"

* commit '787bdb33f6cdffd810dd243eedfbc0aed2c0abed':
  Fix Externally reported security issue