tree f68e03fce1722a5719e53dd4ca242a749731f0ca
parent f5d8857b623192a985e449453de5bf1efaa4ea79
parent 418cb17816c150f6619a592e8fce3c5dd3d1188d
author Brian Carlstrom <bdc@google.com> 1376932999 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1376933249 +0000

Merge "CA certificate update" into klp-dev