tree ce797af1d68926c47363dae6944630b038b5d830
parent 4fc035aaca64214f4af2425d6b6d68187241b38d
parent 0ed888186a59454ff074a53ff8ea0458d8e0fc46
author David 'Digit' Turner <digit@android.com> 1302168823 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1302168823 -0700

am 0ed88818: am cecd02c1: Merge "emulator: Remove the global Make variable trick for emulator-specific system modules."

* commit '0ed888186a59454ff074a53ff8ea0458d8e0fc46':
  emulator: Remove the global Make variable trick for emulator-specific system modules.