OSDN Git Service

am 4b2a602e: am 323fa9c6: Merge "Display the correct encryption settings." into honeycomb
authorJason parks <jparks@google.com>
Tue, 25 Jan 2011 17:59:07 +0000 (09:59 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Jan 2011 17:59:07 +0000 (09:59 -0800)
commitfe6aae82a2e1649d6433c45f92998f8d86a05e34
tree0275afae6e44f4cc4db4dedc5563cbda83c99113
parentf9ea5f9f78662174822c0d2f2b41d033ba7f514a
parent4b2a602eaac76ab117e96271ac4474a0de15795e
am 4b2a602e: am 323fa9c6: Merge "Display the correct encryption settings." into honeycomb

* commit '4b2a602eaac76ab117e96271ac4474a0de15795e':
  Display the correct encryption settings.