Merge "envsetup: Show error when supplied dir isn\'t present with mmm" am:...
Merge "envsetup: Show error when supplied dir isn\'t present with mmm" am: 475054a1 am: 3a6ad870
am: 4c3d8573
* commit '4c3d8573':
envsetup: Show error when supplied dir isn't present with mmm