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:
35cdba9
9af8f27
)
Merge "Remove redundant lockscreen shown check" into oc-dev am: 90c3489525
author
lei.xa.liu
<lei.xa.liu@sonymobile.com>
Tue, 25 Apr 2017 04:42:12 +0000
(
04:42
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 25 Apr 2017 04:42:12 +0000
(
04:42
+0000)
am:
9af8f27ef9
Change-Id: I510e2df0d5f55df6f2f3864273fec2b07844ba45
1
2
services/core/java/com/android/server/am/TaskRecord.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/TaskRecord.java
Simple merge