tree 3127160353c6a70385eae8aa711816bc2752f1a2
parent fc6ed67f0a306a12f382a46ac7294c2c24a034a0
parent 5e782937ead3042255d83f9c1192f2cc7b688d74
author James Dong <jdong@google.com> 1279490932 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279490932 -0700

am 5e782937: am faf775e7: Fix simulator build (1st attempt)

Merge commit '5e782937ead3042255d83f9c1192f2cc7b688d74'

* commit '5e782937ead3042255d83f9c1192f2cc7b688d74':
  Fix simulator build (1st attempt)