tree aca98f7e5b7bdcba9830e975e2af01b8d106a837
parent ec16e4fc3ec6435b200d9e68e15d667efa7f04de
parent 64a053b67371595d2b541cd4f945fcec1fb8e9d2
author Robert Greenwalt <robdroid@android.com> 1282853676 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282853676 -0700

am 64a053b6: am 705ab8db: Fix sim build - remove unncesessary header.

Merge commit '64a053b67371595d2b541cd4f945fcec1fb8e9d2'

* commit '64a053b67371595d2b541cd4f945fcec1fb8e9d2':
  Fix sim build - remove unncesessary header.