tree f89efb10addd135b5025cbe0ac5543ec4b4a5dba
parent 9731392d43e2c7a0181fb9df7af049ff30170c58
parent a67b5aeeb84d4fb368eea4e939cd5ecad1b12760
author keunyoung <keunyoung@google.com> 1362530408 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362530408 +0000

am a67b5aee: am c3eb68c4: pull goldfish specific stuffs from emulator.mk

* commit 'a67b5aeeb84d4fb368eea4e939cd5ecad1b12760':
  pull goldfish specific stuffs from emulator.mk