OSDN Git Service

Merge "A separate entry for work profile CA cert" into oc-mr1-dev
authorTony Mak <tonymak@google.com>
Tue, 22 Aug 2017 18:21:35 +0000 (18:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:21:35 +0000 (18:21 +0000)
commit237e49a7c97e88a9573765e3534ccd2bb0081d46
treee236fdc3495578216120d257f149a4e6af9b6732
parentcab12d6afa0a515ae859e6eb1c128dade1531787
parente040ef4a393fc7b990d878307cd6420d0cfa2d00
Merge "A separate entry for work profile CA cert" into oc-mr1-dev
am: e040ef4a39

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