tree 95010b6fda805116cd12d52175086df4b3133956
parent 575c6710a38f608aca2c25e7784674a47d18a871
parent 64ef1ce9368985932f4cc7a06b3af585394c5cc6
author Oscar Montemayor <oam@google.com> 1265848381 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1265848381 -0800

Merge "Fix for bug 2427961	android.security.tests.SystemKeyStoreTest:testBasicAccess is failing. Fixed issues in test."