tree 7d6406d88d4d2bd63dfe51df080c8ad4c66c4262
parent 6f58e899be728fc2ab3cf3902e52937ebd58e02d
parent 35fbf7876059b64d069d60fd9eab761718344271
author Dan Albert <danalbert@google.com> 1424844839 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424844839 +0000

am 35fbf787: Merge "Fix build from implicit declaration."

* commit '35fbf7876059b64d069d60fd9eab761718344271':
  Fix build from implicit declaration.