tree fe8282eb60df8e7988910643f85ca766f1b1b756
parent 6308514cbff740772534338ed641d3243cca52fe
parent f3f822edc7d9f08edc91a2e1826de127a19c235d
author Brian Carlstrom <bdc@google.com> 1284706479 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284706479 -0700

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

Merge commit 'f3f822edc7d9f08edc91a2e1826de127a19c235d'

* commit 'f3f822edc7d9f08edc91a2e1826de127a19c235d':
  Fix sim-eng build on Hardy