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:
0e7cd0a
9c84192
)
DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0...
author
Matthew Williams
<mjwilliams@google.com>
Thu, 21 Jan 2016 18:37:01 +0000
(18:37 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 21 Jan 2016 18:37:01 +0000
(18:37 +0000)
am:
9c841923df
-s ours
* commit '
9c841923dfc36db046909e388b8a2fda3b694be1
':
DO NOT MERGE Redact Account info from getCurrentSyncs
Trivial merge