diff options
| author | Kenny Root <kroot@google.com> | 2015-06-02 00:48:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-02 00:48:43 +0000 |
| commit | 9585bbef61a7998f840c6ed4b0eb6d88fb4e632a (patch) | |
| tree | c0a3b25cccbd657ea4226357c2aee54e96fc7134 /include/ScopedJavaUnicodeString.h | |
| parent | d0ba011097c1697ca101616fd9e1d92c2fe6b028 (diff) | |
| parent | d9b110bb1feeb32e092bfc6af5d122f58f1ef3e0 (diff) | |
am d9b110bb: resolved conflicts for merge of d8b18995 to klp-modular-dev
* commit 'd9b110bb1feeb32e092bfc6af5d122f58f1ef3e0':
OpenSSLX509Certificate: mark mContext as transient
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions