OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2318d40 9c31684)
Merge "Show a different Root CA string for device owner" into nyc-dev
authorVictor Chang <vichang@google.com>
Tue, 10 May 2016 14:35:53 +0000 (14:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 May 2016 14:35:53 +0000 (14:35 +0000)
am: 9c31684bbe

* commit '9c31684bbe449e320e5174a2fcee4ab1900e182c':
  Show a different Root CA string for device owner

Change-Id: I1d22ab807c576483ffc29cc459e7c321a38fb1a1

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