OSDN Git Service

Merge "Merge "fix "am start -W" hang on activity start" into nyc-dev am: 5e40748...
authorChong Zhang <chz@google.com>
Mon, 25 Apr 2016 17:38:43 +0000 (17:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 17:38:43 +0000 (17:38 +0000)
commit26440e3fa9eed26454468856bdfde3cb1275b757
treea53ccc683ef1a7d65e368c377993683e6ecfaf96
parent9e15c781792b1ab8be5de6769e5cf10c182da8f6
parentaa307b0e0429765544bd3f6202de2146ee37ea22
Merge "Merge "fix "am start -W" hang on activity start" into nyc-dev am: 5e40748 am: 81e2deb" into nyc-mr1-dev-plus-aosp
am: aa307b0

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

Change-Id: I8fd403bf9affb8ca7523f3511a146778b4865ba3