[automerger skipped] Improved 'am switch' to handle errors. am: 2d950c12b5 am: 0db55184d6 -s ours
am skip reason: Change-Id I005c76652be1fd0908f5c2b40e2513362b5ce5ac with SHA-1 75aeb6849f is in history
Change-Id: Ib79aa22f3ad97770da9181149beb444bc68507ea
This commit is contained in: