tree f266f5c514279a7c5a1e87b49ac6a5934dbb36f8
parent 41ffcba464dbbf22a3f0d7459c07ad9c9bffbf0c
parent 3f6d58e270c01f53cd838ad9b79d99a0c6bdd258
author Elliott Hughes <enh@google.com> 1424394650 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424394650 +0000

am 3f6d58e2: am 13f092c0: am b82be174: Merge "Fix implicit function declarations."

* commit '3f6d58e270c01f53cd838ad9b79d99a0c6bdd258':
  Fix implicit function declarations.