tree 35147025d400b188a143c999caee47914c564cbc
parent cde786835676f14c4d24cc4769a2de7ead853c5c
parent fca204a4b8771b800383c91465a48eb2cd8b3ba2
author Narayan Kamath <narayan@google.com> 1394221287 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394221287 +0000

am fca204a4: am 05cebdc2: Merge "Fix several bad function definitions."

* commit 'fca204a4b8771b800383c91465a48eb2cd8b3ba2':
  Fix several bad function definitions.