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:
7402d76
cef9bae
)
[automerger skipped] [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths...
author
Jeff Sharkey
<jsharkey@android.com>
Fri, 12 Oct 2018 05:19:39 +0000
(22:19 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 12 Oct 2018 05:19:39 +0000
(22:19 -0700)
am:
cef9bae62d
-s ours
Change-Id: I5e2cb1a4274d547cfcd18fc010063fa70f75090f
Trivial merge