OSDN Git Service

am a3a52a96: (-s ours) am 4999b175: (-s ours) Merge "Revert "Track change to Conscryp...
authorKenny Root <kroot@google.com>
Tue, 31 Mar 2015 19:22:17 +0000 (19:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 31 Mar 2015 19:22:17 +0000 (19:22 +0000)
commit28c51bacbde1a2a497e20fa4f299fa653eaac9a3
tree23367445da74494cc5a70e2a12c35e44a7f304ab
parent543189eb711c7aeefab9566b74b62c34d35115f5
parenta3a52a96543bd3874e23d90f91b5f4197eab98e5
am a3a52a96: (-s ours) am 4999b175: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev

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