OSDN Git Service

Merge "VpnSettings: add support for server certificates." into ics-mr1
authorChia-chi Yeh <chiachi@android.com>
Wed, 7 Dec 2011 20:26:52 +0000 (12:26 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 7 Dec 2011 20:26:52 +0000 (12:26 -0800)

Trivial merge