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:
07bed49
03981a4
)
am 03981a4c: Merge "Add activity attribute allowEmbedded" into klp-modular-dev
author
Craig Mautner
<cmautner@google.com>
Thu, 24 Apr 2014 16:33:02 +0000
(16:33 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 24 Apr 2014 16:33:02 +0000
(16:33 +0000)
* commit '
03981a4c2e9689197e4d2c916c07ae16207b5276
':
Add activity attribute allowEmbedded
1
2
api/current.txt
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/content/pm/PackageParser.java
patch
|
diff1
|
diff2
|
blob
|
history
core/res/res/values/attrs_manifest.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
api/current.txt
Simple merge
diff --cc
core/java/android/content/pm/PackageParser.java
Simple merge
diff --cc
core/res/res/values/attrs_manifest.xml
Simple merge