| commit | 5c4f9d4d5c65f85e22f9f53fe966ec3867d4454e | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Nov 26 18:21:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 18:21:41 2014 +0000 |
| tree | f177ba684e395ce558fbc2ca3b34632e39d8378f | |
| parent | 2706cb804a4e2d52b671a560f65108cf2ebbcd6d [diff] | |
| parent | cd04bb4fc4e999ff82732481b29e7b221b61c883 [diff] |
am cd04bb4f: am 3476a2a0: am 564ec716: Merge "Track change to Conscrypt" * commit 'cd04bb4fc4e999ff82732481b29e7b221b61c883': Track change to Conscrypt