OSDN Git Service

Merge \\"Don\\'t make redundant launch while updating configuration\\" into nyc-mr1...
authorAndrii Kulian <akulian@google.com>
Wed, 13 Jul 2016 02:37:02 +0000 (02:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Jul 2016 02:37:02 +0000 (02:37 +0000)
commit8664c1e7fd13fa95be8f9d2f718929b2c33a5321
treee28b7ff330583adb5c70ab07ead08599dda3181f
parent7233603588688ff5ac710c7d2e3f3bc4b89c3907
parent082cab4bb492cc0edb38e168bc03eb15397b97c5
Merge \\"Don\\'t make redundant launch while updating configuration\\" into nyc-mr1-dev am: 4c7b339411
am: 082cab4bb4

Change-Id: I33a09d4a35d36707e155eb56ca53bab79f31af06
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/ActivityStackSupervisor.java