tree ea864671559527f15ae8faa82756ca10db50fa23
parent 56ec3c888a19b16ef056c157ed63d94adef7f201
parent 4165dd21592c958bacc97043d56b1ea914ab94c9
author Chia-chi Yeh <chiachi@android.com> 1268099456 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1268099456 -0800

Merge "keystore: add AID_ROOT into the user table."