tree fd2ee906ecdba73a18687e1dc23f3e6eceb92be0
parent 66f48dd6cddd0b150000ade707096e701dbde9f3
parent 2dde61e46ab789f18956ff3b7c257dd8eb97993f
author Dan Willemsen <dwillemsen@google.com> 1495567909 -0700
committer Dan Willemsen <dwillemsen@google.com> 1495567919 -0700

Merge remote-tracking branch 'aosp/upstream' into master

* aosp/upstream:
  Add --werror_find_emulator, --werror_overriding_commands

Test: Upstream tests
Change-Id: Ibd1c8ab9945d38543088f99b2532514ea8a9d7f6