tree d951f02bd6cc03979e105c786893bdabc4ee6cd5
parent 0a3eafe699082f289e03892f234a6a4c45f178c5
parent a3dc45ac9f4c7e1bfa8a5084add450ab0712f117
author Nick Pelly <npelly@google.com> 1286938118 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286938118 -0700

am a3dc45ac: Fix build.

Merge commit 'a3dc45ac9f4c7e1bfa8a5084add450ab0712f117' into gingerbread-plus-aosp

* commit 'a3dc45ac9f4c7e1bfa8a5084add450ab0712f117':
  Fix build.