| commit | 323fa9c669da74cf1dde982c982f7ea9c0c1b5a8 | [log] [tgz] |
|---|---|---|
| author | Jason parks <jparks@google.com> | Tue Jan 25 09:53:00 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jan 25 09:53:00 2011 -0800 |
| tree | d8e73b2b5459f91783c2e1eaaa19610a9ee85d78 | |
| parent | af6d7cf23ca5ca86c39845711f431e76b877a31e [diff] | |
| parent | 4112199ed654f8bd1cea2c9a29a24be3c148b2ed [diff] |
Merge "Display the correct encryption settings." into honeycomb