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:
f9c0f06
3c9ad07
)
Merge "Check permission for activity embedding" into oc-mr1-dev
author
Andrii Kulian
<akulian@google.com>
Fri, 25 Aug 2017 16:49:26 +0000
(16:49 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Fri, 25 Aug 2017 16:49:26 +0000
(16:49 +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