tree ed1c496d4f3956cf8babe449be18e206d842b246
parent c6623763231c35b738863f5429ddf11c1af3a0be
parent 2a59fa7dd29872c203218ebc3da45011f7caf66c
author David 'Digit' Turner <digit@android.com> 1314303039 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1314303039 -0700

am 2a59fa7d: Merge "emulator: fix the build"

* commit '2a59fa7dd29872c203218ebc3da45011f7caf66c':
  emulator: fix the build