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:
93b55c1
019b1f2
)
am 019b1f26: am 2ea983a5: am 3d9bcb90: Create FEATURE_ constants for print and backup
author
Adam Lesinski
<adamlesinski@google.com>
Tue, 18 Feb 2014 23:03:37 +0000
(23:03 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 18 Feb 2014 23:03:37 +0000
(23:03 +0000)
* commit '
019b1f2668ac17f5e52b6ce32a524d26134a062a
':
Create FEATURE_ constants for print and backup
1
2
api/current.txt
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/content/pm/PackageManager.java
patch
|
diff1
|
diff2
|
blob
|
history
services/java/com/android/server/SystemServer.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
api/current.txt
Simple merge
diff --cc
core/java/android/content/pm/PackageManager.java
Simple merge
diff --cc
services/java/com/android/server/SystemServer.java
Simple merge