OSDN Git Service

am 323fa9c6: Merge "Display the correct encryption settings." into honeycomb
authorJason parks <jparks@google.com>
Tue, 25 Jan 2011 17:56:00 +0000 (09:56 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Jan 2011 17:56:00 +0000 (09:56 -0800)
commit4b2a602eaac76ab117e96271ac4474a0de15795e
treef3a6097b061342a7c3fb65e8116d987baacf70c9
parentd065fffcf5e13af5638d232d7a7ca38cd0aa9e46
parent323fa9c669da74cf1dde982c982f7ea9c0c1b5a8
am 323fa9c6: Merge "Display the correct encryption settings." into honeycomb

* commit '323fa9c669da74cf1dde982c982f7ea9c0c1b5a8':
  Display the correct encryption settings.