OSDN Git Service

am 5fdb2ea7: (-s ours) am a7645df5: (-s ours) Merge "Revert "Track change to Conscryp...
authorKenny Root <kroot@google.com>
Tue, 31 Mar 2015 16:54:32 +0000 (16:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 31 Mar 2015 16:54:32 +0000 (16:54 +0000)
commit6a2d2b9f2b8b3fab6eafe37626a02b0a2f52747f
tree04ba47e90bf6c09b04655f56df4a493a99346cc9
parent6abcec1d7653dce2dc057879b7cdbe3ff94259f3
parent5fdb2ea76a8e0ffe8786a1e92ce565f7380384db
am 5fdb2ea7: (-s ours) am a7645df5: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev

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