OSDN Git Service

Merge "fix "am start -W" hang on activity start" into nyc-dev am: 5e40748
authorChong Zhang <chz@google.com>
Mon, 25 Apr 2016 17:27:12 +0000 (17:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 17:27:12 +0000 (17:27 +0000)
am: 93d22c2

* commit '93d22c2a6c884c306cbca1fb4904ef91b1511447':
  fix "am start -W" hang on activity start

Change-Id: I31b86327ff2865b4017c3e78c96a3c22411fa645


Trivial merge