commit | cb7a36050f34d3c16be00d532411820761eeb276 | [log] [tgz] |
---|---|---|
author | Neil Fuller <nfuller@google.com> | Thu Oct 09 14:49:09 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 09 14:49:09 2014 +0000 |
tree | 1d41d3ce6b0079e88c2b4a59078c231eca3a35a8 | |
parent | 8d7e23e117da591a8d48e6bcda9ed6f58ff1a375 [diff] | |
parent | ea961ada17d50ec1f2006c2843d1d4164d0e1342 [diff] |
am ea961ada: Apply conscrypt changes from merge commit * commit 'ea961ada17d50ec1f2006c2843d1d4164d0e1342': Apply conscrypt changes from merge commit