tree d34e60a1526d07d90d13e07bd40c1a7328adc4e3
parent 4c918335ef6ac44530bfefa33860a4e0b23b523c
parent c81ec79d1f88ae8a80e08560a56845655a74f67e
author Nick Pelly <npelly@google.com> 1287764261 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287764261 -0700

am c81ec79d: am 0592832c: Merge "Attempt to fix simulator build." into gingerbread

Merge commit 'c81ec79d1f88ae8a80e08560a56845655a74f67e'

* commit 'c81ec79d1f88ae8a80e08560a56845655a74f67e':
  Attempt to fix simulator build.