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:
3aefa11
ba56701
)
am ba567014: am e37c8f78: Merge "Improve API and documentation" into jb-mr2-dev
author
Amith Yamasani
<yamasani@google.com>
Fri, 19 Apr 2013 19:49:40 +0000
(12:49 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 19 Apr 2013 19:49:40 +0000
(12:49 -0700)
* commit '
ba56701493ede3f5f338a03173da0327a215b223
':
Improve API and documentation
1
2
api/current.txt
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/content/Intent.java
patch
|
diff1
|
diff2
|
blob
|
history
services/java/com/android/server/accounts/AccountManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
api/current.txt
Simple merge
diff --cc
core/java/android/content/Intent.java
Simple merge
diff --cc
services/java/com/android/server/accounts/AccountManagerService.java
Simple merge