OSDN Git Service

Merge "Show a different Root CA string for device owner" into nyc-dev am: 9c31684bbe
authorVictor Chang <vichang@google.com>
Tue, 10 May 2016 14:42:47 +0000 (14:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 May 2016 14:42:47 +0000 (14:42 +0000)
commitf906f3c24a711e02ed17fa0ebf1aa7dc024fabdf
treee43d08373f5b1ea49eba6b86ceb6b0e7190bd6e6
parent00696bbe4077b88494491dbdad697a0cb3826fb5
parent5ffcedbae97338a8d549592d8149cee98cea61f0
Merge "Show a different Root CA string for device owner" into nyc-dev am: 9c31684bbe
am: 5ffcedbae9

* commit '5ffcedbae97338a8d549592d8149cee98cea61f0':
  Show a different Root CA string for device owner

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