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:
db8102a
04bfaf9
)
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e5...
author
Jeff Sharkey
<jsharkey@google.com>
Fri, 3 Feb 2017 01:55:01 +0000
(
01:55
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 3 Feb 2017 01:55:01 +0000
(
01:55
+0000)
am:
04bfaf9749
-s ours
Change-Id: I601910b6d9b563ad95c40a7c45bdc618c469cca8
Trivial merge