tree 523616491df2df69193e4609d505ba117d0c0c4a
parent 156edcc9f64e010d6b6de97e9a77adfccee353eb
parent 987ba54127caaaa87056965b3d98b7e1a5b110b7
author Brian Carlstrom <bdc@google.com> 1284706291 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284706291 -0700

am 987ba541: Merge "Fix sim-eng build on Hardy" into gingerbread

Merge commit '987ba54127caaaa87056965b3d98b7e1a5b110b7' into gingerbread-plus-aosp

* commit '987ba54127caaaa87056965b3d98b7e1a5b110b7':
  Fix sim-eng build on Hardy