tree d891ed1ae21d6b91cf00ebf0501e3de10414a742
parent 3f19c95ec5cc4214ac567d4b004f7851c5a505d8
parent 75c7cc6ca9ffd821288acead552b00978567cb6d
author Chong Zhang <chz@google.com> 1466616257 +0000
committer android-build-merger <android-build-merger@google.com> 1466616257 +0000

Merge \"Unblock \'am start -W\' if activity is brought to front without launching\" into nyc-dev
am: 75c7cc6ca9

Change-Id: I983331f65f03d50c26b7929866e3ce5d5ae19966