OSDN Git Service

Merge "Add and enforce the permission for encrypting/decrypting." into honeycomb
authorJason parks <jparks@google.com>
Fri, 21 Jan 2011 19:59:15 +0000 (11:59 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 21 Jan 2011 19:59:15 +0000 (11:59 -0800)

Trivial merge