tree a07cc87ec45717f3fd6b412a39534d43b1fa2247
parent 7082b508c7da31c3e44842f9bb651d5f79f3a909
parent be3e410b7a62fa64ffda825b824862eb9d0c98c5
author Sameer Padala <sxp@google.com> 1398199857 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398199857 +0000

am be3e410b: Fix source code so it compiles on google3

* commit 'be3e410b7a62fa64ffda825b824862eb9d0c98c5':
  Fix source code so it compiles on google3