OSDN Git Service

Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev am...
authorRob Carr <racarr@google.com>
Wed, 21 Oct 2015 00:29:53 +0000 (00:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Oct 2015 00:29:53 +0000 (00:29 +0000)
commit379c1c5430aae1a62bfdfd44e7676841b3e9e120
treea2913708405980d39a4baa7e4b03c3958a7ac1a5
parentc32d045c7bd222a60452eb3bea9c5dd4234afc90
parente7413fc53f47a31fbe998de48ee0e5edd79ed96c
Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev am: 9ada400e98 am: 894dd2b078 am: a153a8072c
am: e7413fc53f

* commit 'e7413fc53f47a31fbe998de48ee0e5edd79ed96c':
  Catch exceptions thrown by pending activity launches.
services/core/java/com/android/server/am/ActivityStackSupervisor.java