tree 5f30bfdb4a32ac349413939b2365c753af285fd1
parent 255e7d7183d8ad4171408c476d19e95dad502eb2
parent 10fad6adce755808a21c02e1c4b94df7bf84e8b1
author Nick Kralevich <nnk@google.com> 1405371075 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405371075 +0000

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

* commit '10fad6adce755808a21c02e1c4b94df7bf84e8b1':
  Fix Externally reported security issue