am bdec2e56: am c9e59899: Merge "Clarify rules about encryption of emulated...
am bdec2e56: am c9e59899: Merge "Clarify rules about encryption of emulated storage." into honeycomb-mr1
* commit 'bdec2e56':
Clarify rules about encryption of emulated storage.