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:
978b8e1
810c312
)
Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev
author
Michal Karpinski
<mkarpinski@google.com>
Mon, 31 Jul 2017 19:03:13 +0000
(19:03 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 31 Jul 2017 19:03:13 +0000
(19:03 +0000)
am:
810c312a29
Change-Id: Ida86b2e9f68683c88db24bcbb16eaf14ce8f2d94
1
2
services/backup/java/com/android/server/backup/BackupManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/backup/java/com/android/server/backup/BackupManagerService.java
Simple merge
OSDN Git Service
