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:
568f4de
56878a9
)
Merge "Create work challenge timeout"
author
Clara Bayarri
<clarabayarri@google.com>
Thu, 3 Dec 2015 12:04:24 +0000
(12:04 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 3 Dec 2015 12:04:24 +0000
(12:04 +0000)
1
2
services/core/java/com/android/server/am/ActivityStackSupervisor.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityStackSupervisor.java
Simple merge