OSDN Git Service

Merge changes I54360698,Ic8a3db21
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 21 Mar 2017 23:04:07 +0000 (23:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 21 Mar 2017 23:04:08 +0000 (23:04 +0000)
commitca3997d27e3cb0444aaf21cfaf67da934992df3e
tree5b33fb50715a7047430843e36399671a49748658
parent19449197e6f76e36d5d8f5bb7eed1ecb94b37648
parentb076e00c5eed6720c5347a2d15890aa9d11157b0
Merge changes I54360698,Ic8a3db21

* changes:
  Finish removing N/A DO disclosures from search index
  DO Disclosures: Combine personal and work CA cert
res/values/strings.xml