| commit | a90ad2ced2ca2f5153d4c012c12c1397f712ff0d | [log] [tgz] |
|---|---|---|
| author | Andy Stadler <stadler@google.com> | Tue Mar 08 18:41:20 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 08 18:41:20 2011 -0800 |
| tree | 04c2fbe2a0301bc0d8cd8d89386b7a95761909a0 | |
| parent | cf0f9a0b62726de469db943cddd79f50bb7dbe2c [diff] | |
| parent | bdec2e565bd1f086d65a956db432bf54cdf78f6d [diff] |
am bdec2e56: am c9e59899: Merge "Clarify rules about encryption of emulated storage." into honeycomb-mr1 * commit 'bdec2e565bd1f086d65a956db432bf54cdf78f6d': Clarify rules about encryption of emulated storage.