git.osdn.net Git - android-x86/packages-apps-Settings.git/commit

Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev

* 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

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)
commit	826b14e43ea9daaba91da8abf5e31aa32045e204
tree	190bee8fad399810242dbee88df12615f5d72a60	tree \| snapshot
parent	e36ca3e96d8c014d39f6ffa377f5e5fc69e1f4c5	commit \| diff
parent	1871d3d3a7ad20cfc78180233c0b8f7e807236a0	commit \| diff