tree c8fecefbb6e166cfd94819b4d1fbacfe75c23fda
parent 8d29f4cab33227f1d12d37214b39f4d22b5bd08b
parent 8007a21e799ec05a45435d4b688116e88de98221
author Dan Albert <danalbert@google.com> 1424883898 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424883898 +0000

am 8007a21e: am 6deb3d5c: am 35fbf787: Merge "Fix build from implicit declaration."

* commit '8007a21e799ec05a45435d4b688116e88de98221':
  Fix build from implicit declaration.