tree c46f5ed5125de2e10d96efb92f2ff1fa6c85cda4
parent 0f94fc6f1df4ef03e639190a138d650bc6cf8adf
parent 05ad674aa888e3f9217de0e5c3176161dd8e31aa
author Nick Kralevich <nnk@google.com> 1429999525 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429999525 +0000

am 05ad674a: am 00e165ae: am e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"

* commit '05ad674aa888e3f9217de0e5c3176161dd8e31aa':
  fix compiler error under FORTIFY_SOURCE=2