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:49 +0000 (14:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 May 2016 14:42:49 +0000 (14:42 +0000)
commit94c75422da33257547991bcc5dacdfacdb990b7c
treee43d08373f5b1ea49eba6b86ceb6b0e7190bd6e6
parent00696bbe4077b88494491dbdad697a0cb3826fb5
parent5296dbca738761167ea67dc42db5301a7ec686f8
Merge "Show a different Root CA string for device owner" into nyc-dev am: 9c31684bbe
am: 5296dbca73

* commit '5296dbca738761167ea67dc42db5301a7ec686f8':
  Show a different Root CA string for device owner

Change-Id: I81dea6096db6ebd7b85df9a19c2cc375c339e3e7