| commit | 4999b175e9c25b7e860f9c2f3b6566d08c8e50e7 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Mar 31 19:10:48 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Mar 31 19:10:50 2015 +0000 |
| tree | 7f2aeb4d1dffb78996cf1ef38bd885ab54364f61 | |
| parent | 13d8e41d3a866df0899a89c44c6afc4e2eb31bdc [diff] | |
| parent | 9a7c1a35491e06af2711abb760a209d2f82c8247 [diff] |
Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev