tree b790aa4cc56f3944f306a35b1c891ef18c092a81
parent b45c33cd0cc49f4d463e9414d7c653508e9aa875
parent d036711427ff7ecbf603b51e04c75986504138d9
author David 'Digit' Turner <digit@google.com> 1410903273 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410903273 +0000

am d0367114: Merge "envsetup.sh: Fix handling of emulator prebuilts path." into lmp-dev

* commit 'd036711427ff7ecbf603b51e04c75986504138d9':
  envsetup.sh: Fix handling of emulator prebuilts path.