OSDN Git Service

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)
commit5296dbca738761167ea67dc42db5301a7ec686f8
treecb0f5f78162ed4a9c7b61c74a5d55e0919fde6c7
parent2318d40fc32643a431502b5b9633674c16f363ac
parent9c31684bbe449e320e5174a2fcee4ab1900e182c
Merge "Show a different Root CA string for device owner" into nyc-dev
am: 9c31684bbe

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

Change-Id: I1d22ab807c576483ffc29cc459e7c321a38fb1a1
res/values/strings.xml