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:
0bdb567
39f5537
)
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c4...
author
Suprabh Shukla
<suprabh@google.com>
Wed, 16 Aug 2017 22:11:33 +0000
(22:11 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 16 Aug 2017 22:11:33 +0000
(22:11 +0000)
am:
39f553782c
-s ours
Change-Id: Iaa91677ee23b5b43e74ab24b50abd752be1315b7
Trivial merge