am daac9dd9: (-s ours) am c22d145a: am 3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2

* commit 'daac9dd9742c3a1eaeee339c4d21e6f2dc758923':
  DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()
This commit is contained in:
Andy Stadler 2011-06-03 16:35:21 -07:00 committed by Android Git Automerger
commit 47222c7889

Diff Content Not Available