tree 86e3eb3a56c41fe82cb1dd067103a33ec09387a9
parent bce8ca33d087a081a66d869c43a5efc6c9afdd57
parent d960239de6371c2368792c6cc75de6d59abe172c
author David 'Digit' Turner <digit@android.com> 1314641101 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1314641101 -0700

am d960239d: am 43946da5: am 7f45e7c1: Merge "emulator: oops, really fix the build"

* commit 'd960239de6371c2368792c6cc75de6d59abe172c':
  emulator: oops, really fix the build