tree 05cf7fab1bb3f80ebfd837ed2d78a891d7a2b592
parent f7c01e5a8a4e7e3032dd03a3705f6894312e9b5f
parent 54519e7041c9e30cefa1a175563f6a2f9bd2e478
author Elliott Hughes <enh@google.com> 1363710669 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363710669 -0700

am 54519e70: Fix build.

* commit '54519e7041c9e30cefa1a175563f6a2f9bd2e478':
  Fix build.