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