OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4898225
0737c2b
)
DO NOT MERGE Stop work challenge freeform bypass
author
Robin Lee
<rgl@google.com>
Wed, 7 Sep 2016 22:15:22 +0000
(22:15 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 7 Sep 2016 22:15:22 +0000
(22:15 +0000)
am:
0737c2b4c2
Change-Id: Ib613296306978c0bfbf1ea6e1dcdb7a72b867a55
1
2
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityStackSupervisor.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityStackSupervisor.java
Simple merge