diff options
| author | Robin Lee <rgl@google.com> | 2016-02-23 21:52:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-23 21:52:17 +0000 |
| commit | 0ac64f8d62a73d38ea8bcb5f684aba7021d6a00c (patch) | |
| tree | dcda1c219c01e53ff2712cc30827a59898db8179 | |
| parent | 1925ce864d3e465ed6f5259aa035401e8d937a70 (diff) | |
| parent | 366e5932c97aea65a147d55370eb94776be1fa56 (diff) | |
| download | android_packages_apps_CertInstaller-0ac64f8d62a73d38ea8bcb5f684aba7021d6a00c.tar.gz android_packages_apps_CertInstaller-0ac64f8d62a73d38ea8bcb5f684aba7021d6a00c.tar.bz2 android_packages_apps_CertInstaller-0ac64f8d62a73d38ea8bcb5f684aba7021d6a00c.zip | |
resolve merge conflicts of ef177fb06e to cw-e-dev am: 7e2d30d880
am: 366e5932c9 -s ours
* commit '366e5932c97aea65a147d55370eb94776be1fa56':
Trust CA certificates added for the whole OS only
0 files changed, 0 insertions, 0 deletions