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:
26f4ace
78a9d59
)
Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f...
author
Suprabh Shukla
<suprabh@google.com>
Wed, 16 Aug 2017 19:43:31 +0000
(19:43 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 16 Aug 2017 19:43:31 +0000
(19:43 +0000)
am:
78a9d598f1
-s ours
Change-Id: Id94c32bb309dfe9808b30a19fbd42334f3f9f19b
Trivial merge