OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 826b14e 3d99dc7)
Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev
authorAtanas Kirilov <akirilov@google.com>
Mon, 4 Jun 2018 20:24:25 +0000 (20:24 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 4 Jun 2018 20:24:25 +0000 (20:24 +0000)
commit9e626734bb043aa8e0bd367e317113e53f04aebf
tree190bee8fad399810242dbee88df12615f5d72a60tree | snapshot
parent826b14e43ea9daaba91da8abf5e31aa32045e204commit | diff
parent3d99dc7e7d7b7c98498ac432a8a4330dd65ffc5dcommit | diff
Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev

* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8 skipped: 8bc91c3b8b skipped: 3e48235bf6
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8 skipped: 8bc91c3b8b
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71
  Merge translations of Bluetooth confirmation text
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help