commit | c9e598995db68cf97dc3ed0fc527a35e2d966afd | [log] [tgz] |
---|---|---|
author | Andy Stadler <stadler@google.com> | Tue Mar 08 14:50:32 2011 -0800 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Mar 08 14:50:32 2011 -0800 |
tree | 45b4368b1aaae217ac623c89f133b54ac454e18f | |
parent | 3d7796c17ffae7892d1987053c3b6698697cffa2 [diff] | |
parent | 50c294f21b3348010c3f91c5a998d54e1e45d2e4 [diff] |
Merge "Clarify rules about encryption of emulated storage." into honeycomb-mr1