tree 7d6406d88d4d2bd63dfe51df080c8ad4c66c4262
parent 218dab7fdafbc613aa54d1fad0de0dcadd575186
parent 6deb3d5cf266ce18aefb819c5994f504e0df103b
author Dan Albert <danalbert@google.com> 1424883178 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424883178 +0000

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

* commit '6deb3d5cf266ce18aefb819c5994f504e0df103b':
  Fix build from implicit declaration.