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:06:43 +0000 (00:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Oct 2015 00:06:43 +0000 (00:06 +0000)
commite7413fc53f47a31fbe998de48ee0e5edd79ed96c
treeeed17baf4024542e9b4a493372d0a1acfbc073da
parentfc5c6090ec0a8a07d7dbaa4e3b8ed4da9cde233c
parenta153a8072c0a28c36db2489a2ba13b1fc8e179db
Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev am: 9ada400e98 am: 894dd2b078
am: a153a8072c

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