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