OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
091ebcc
f70906f
)
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am...
author
Jeff Sharkey
<jsharkey@android.com>
Wed, 11 Oct 2017 21:53:47 +0000
(21:53 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 11 Oct 2017 21:53:47 +0000
(21:53 +0000)
am:
f70906f2da
-s ours
Change-Id: I13c9c64d607d6ab5a4358786c3974c1920a4e679
Trivial merge