tree c21beaa4015313b25616db50d28c713425d9696d
parent 7a96ba436c9a2bacc64e712bdb53bd7accc5c3a9
parent efca22636f4036da32f2f6734926442f5ebb422b
author Andy McFadden <fadden@android.com> 1278010554 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1278010554 -0700

am efca2263: am cc4d11c2: Merge "Fix sim-eng build." into gingerbread

Merge commit 'efca22636f4036da32f2f6734926442f5ebb422b'

* commit 'efca22636f4036da32f2f6734926442f5ebb422b':
  Fix sim-eng build.