diff options
| author | Kenny Root <kroot@google.com> | 2015-06-04 06:59:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-04 06:59:40 +0000 |
| commit | 81a0cd7760edf6f06977ebfc5ec4633f17352078 (patch) | |
| tree | aa097699e1abec81c8d5aa627a18796bed98cb46 /xml/src/main/java | |
| parent | b96afd7caf4486aa3306b62c08f43a660b5bf8f8 (diff) | |
| parent | a6eb9b5f9ad50f52c5bc7bc39b183e4e14d93677 (diff) | |
| download | libcore-81a0cd7760edf6f06977ebfc5ec4633f17352078.zip libcore-81a0cd7760edf6f06977ebfc5ec4633f17352078.tar.gz libcore-81a0cd7760edf6f06977ebfc5ec4633f17352078.tar.bz2 | |
am a6eb9b5f: am 9585bbef: am d9b110bb: resolved conflicts for merge of d8b18995 to klp-modular-dev
* commit 'a6eb9b5f9ad50f52c5bc7bc39b183e4e14d93677':
OpenSSLX509Certificate: mark mContext as transient
Diffstat (limited to 'xml/src/main/java')
0 files changed, 0 insertions, 0 deletions