tree 4d93c1a6f7608bc03a2685847f9490094d6d2ec4
parent 41c3eed8ab210530c1bebd284eb247cad2cd67b0
parent 705ab8db827b0f7f3389463af67d173c8a94fc8a
author Robert Greenwalt <robdroid@android.com> 1282838568 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282838568 -0700

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

Merge commit '705ab8db827b0f7f3389463af67d173c8a94fc8a' into gingerbread-plus-aosp

* commit '705ab8db827b0f7f3389463af67d173c8a94fc8a':
  Fix sim build - remove unncesessary header.