tree 54f90843d55d051f1155b8b5851c1759dcdd660c
parent 23b444a2e4e808262c22fa5254db9861eb961879
parent f4b92ec567477fcdea24fdd18116b045dfcf9852
author Brian Carlstrom <bdc@google.com> 1309553017 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1309553017 -0700

Merge "Revert "Add keychain user with special keystore access permissions""