OSDN Git Service

resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp
authorJeff Brown <jeffbrown@google.com>
Wed, 9 Apr 2014 23:47:40 +0000 (16:47 -0700)
committerJeff Brown <jeffbrown@google.com>
Wed, 9 Apr 2014 23:47:40 +0000 (16:47 -0700)
commit6fdb5e6df178b3b1062ac67b505b288aa609a66b
treeee0deb7f1f9bd87e35cf6a8a7bb1d638de1c145e
parent280fe930a432d9e2ead8c4b58ce76a0ee45742e7
parent7289f3ab8f05db6206d696d75f460fadc05dc731
resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp

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