tree c4335e42df3214881b43246d7dee8db00f976d58
parent 34687664bee78c7d25b3bbb4fcd53864a74ed0de
parent 9d7faa91be6661eccf73494f1ab96ae9a28d42d7
author Brian Carlstrom <bdc@google.com> 1307487449 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1307487449 -0700

Merge "Change KeyChain to assume PEM encoded keystore entries"