OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c4e2d7 12c2c25)
Merge "Add subtext for default keyboard layout." into nyc-dev
authorMichael Wright <michaelwr@google.com>
Tue, 3 May 2016 18:34:17 +0000 (18:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 May 2016 18:34:17 +0000 (18:34 +0000)
am: 12c2c2538b

* commit '12c2c2538b1e87f1a2d75f001772719bca9ab8f4':
  Add subtext for default keyboard layout.

Change-Id: I4cfe66c6352b72e7b9baf933d9835df2a8c84282

1  2 
res/values/strings.xml patch | diff1 | diff2 | blob | history

diff --cc res/values/strings.xml
Simple merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help