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:
13b12fd
98e0930
)
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
author
Phil Weaver
<pweaver@google.com>
Wed, 12 Jul 2017 22:06:35 +0000
(22:06 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 12 Jul 2017 22:06:35 +0000
(22:06 +0000)
am:
98e0930394
-s ours
Change-Id: I8de29bde0bf73adde876e6cba0e4e61de6e4f2cb
Trivial merge