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:
6bbd6c6
72402f9
)
am 72402f9d: am 09d8e3cf: am c68bb182: Merge "SyncManager now returns copy on getCurr...
author
Matthew Williams
<mjwilliams@google.com>
Thu, 14 Nov 2013 17:32:02 +0000
(09:32 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 14 Nov 2013 17:32:02 +0000
(09:32 -0800)
* commit '
72402f9de7b108d77316e3c93399b07a2f98c42a
':
SyncManager now returns copy on getCurrentSyncs()
1
2
core/java/android/content/SyncInfo.java
patch
|
diff1
|
diff2
|
blob
|
history
services/java/com/android/server/content/ContentService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/java/com/android/server/content/SyncStorageEngine.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/content/SyncInfo.java
Simple merge
diff --cc
services/java/com/android/server/content/ContentService.java
Simple merge
diff --cc
services/java/com/android/server/content/SyncStorageEngine.java
Simple merge
OSDN Git Service
