OSDN Git Service

Merge "Update encryption commands." into honeycomb
authorJason parks <jparks@google.com>
Fri, 21 Jan 2011 19:39:15 +0000 (11:39 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 21 Jan 2011 19:39:15 +0000 (11:39 -0800)

Trivial merge