tree 793c8cf9187aa49037d151e178efb96831411a63
parent 7c3749c24ad6dad7e5ddf5b0478731470761d99c
parent 8f03e3cb3db392127fd8dc0a2ce62aa15a755ffd
author Dan Albert <danalbert@google.com> 1427569663 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427569663 +0000

am 8f03e3cb: Merge "Revert "Remove the emulator special case from the "adb root" code.""

* commit '8f03e3cb3db392127fd8dc0a2ce62aa15a755ffd':
  Revert "Remove the emulator special case from the "adb root" code."