OSDN Git Service

am a7645df5: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHER...
authorKenny Root <kroot@google.com>
Tue, 31 Mar 2015 16:46:39 +0000 (16:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 31 Mar 2015 16:46:39 +0000 (16:46 +0000)
commit5fdb2ea76a8e0ffe8786a1e92ce565f7380384db
tree65501ef22422ea1051660ceb2f0018ef56dc4e88
parentdf736de8d8165b1aff675d00581ccdf94a7547aa
parenta7645df5973cfb26aecabe093409e33eb745df17
am a7645df5: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev

* commit 'a7645df5973cfb26aecabe093409e33eb745df17':
  Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE