tree 80d10bccb0eece5f06900219c3f23f0abcd83957
parent aed922ffffcf872c5d37ed349c4da961eb84f841
parent 74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64
author Eric Laurent <elaurent@google.com> 1282758115 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282758115 -0700

am 74ede9e4: am 67b50606: Merge "Fix the simulator build." into gingerbread

Merge commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64'

* commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64':
  Fix the simulator build.