OSDN Git Service

Merge "Add button to trust a CA cert" into nyc-dev am: b49c901
authorVictor Chang <vichang@google.com>
Wed, 6 Apr 2016 11:07:55 +0000 (11:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Apr 2016 11:07:55 +0000 (11:07 +0000)
commit67691696f29fdd0bb7f42d01b3a4ce82da751aa3
treefad306be6974e2a13a1d3648d936d76279305326
parent28489bbd72ab40470ba6deacd7589896f844b203
parent2bd4e1689f1e154a9a4a1d47ccbe13c6e8f08dea
Merge "Add button to trust a CA cert" into nyc-dev am: b49c901
am: 2bd4e16

* commit '2bd4e1689f1e154a9a4a1d47ccbe13c6e8f08dea':
  Add button to trust a CA cert

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