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:
2ac0462
fbb0796
)
am fbb0796e: am 3359bbe0: Merge "Add test for attribute android:allowEmbedded" into...
author
Craig Mautner
<cmautner@google.com>
Fri, 25 Apr 2014 00:44:56 +0000
(
00:44
+0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 25 Apr 2014 00:44:56 +0000
(
00:44
+0000)
* commit '
fbb0796eb3bbbdfeb3218b9495a0f36f4cf4ed19
':
Add test for attribute android:allowEmbedded
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
OSDN Git Service
