tree dc31c608170f0c8212d99e24f935f309add773d0
parent 3b3931436274166977488771ae04b3946f497f2a
parent 21fadeaad1f5a662df425085551c6f54e8c28f52
author Winson Chung <winsonc@google.com> 1335567957 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335567957 -0700

am 21fadeaa: Fixing build.

* commit '21fadeaad1f5a662df425085551c6f54e8c28f52':
  Fixing build.