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:
e36ca3e
1871d3d
)
Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev
author
Atanas Kirilov
<akirilov@google.com>
Mon, 4 Jun 2018 20:24:19 +0000
(20:24 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Mon, 4 Jun 2018 20:24:19 +0000
(20:24 +0000)
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d
skipped:
5b4de5e724
skipped:
cb66517282
skipped:
874c51780f
skipped:
551be9a85f
skipped:
93ee1bd17e
skipped:
30d0145ead
skipped:
b9aa0fbfe9
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d
skipped:
5b4de5e724
skipped:
cb66517282
skipped:
874c51780f
skipped:
551be9a85f
skipped:
93ee1bd17e
skipped:
30d0145ead
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d
skipped:
5b4de5e724
skipped:
cb66517282
skipped:
874c51780f
skipped:
551be9a85f
skipped:
93ee1bd17e
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d
skipped:
5b4de5e724
skipped:
cb66517282
skipped:
874c51780f
skipped:
551be9a85f
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d
skipped:
5b4de5e724
skipped:
cb66517282
skipped:
874c51780f
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d
skipped:
5b4de5e724
skipped:
cb66517282
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d
skipped:
5b4de5e724
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d
Merge translations of Bluetooth confirmation text
Trivial merge