OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3857681 cddaf4d)
resolved conflicts for merge of cddaf4d5 to jb-dev-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Jun 2012 18:01:19 +0000 (11:01 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 11 Jun 2012 18:01:19 +0000 (11:01 -0700)
commitb8c6405fda9c41541868773f40ddd29bb1fc7ed8
tree83c9dfae90f47a57c84cd668f90291ad5437f385tree | snapshot
parent3857681e5885b64e593dcc3e28492b156d860ed3commit | diff
parentcddaf4d572ab5de2635b5d0efeda3ce42b97ddd0commit | diff
resolved conflicts for merge of cddaf4d5 to jb-dev-plus-aosp

Change-Id: I973d361a9599b32f9eaced0748d984900590ea3d
services/java/com/android/server/am/ActivityManagerService.java diff1 | diff2 | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help