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:
6b89229
9b85862
)
DO NOT MERGE. Check provider access for content changes.
author
Jeff Sharkey
<jsharkey@android.com>
Fri, 2 Dec 2016 18:19:50 +0000
(18:19 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 2 Dec 2016 18:19:50 +0000
(18:19 +0000)
am:
9b85862620
-s ours
Change-Id: I2a67bbde8b3e131ba62cedd0b6629912e226ba90
Trivial merge