| commit | ed6d773ad2d3f955198ffffd9dd793ad76709870 | [log] [tgz] |
|---|---|---|
| author | Andy Stadler <stadler@google.com> | Fri Jun 03 16:35:21 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 03 16:35:21 2011 -0700 |
| tree | 6178bf10fe3bbc3a2134a828675f226df82fc2d8 | |
| parent | da3505993ce8f6e3c207b97813e0e0818e253187 [diff] | |
| parent | daac9dd9742c3a1eaeee339c4d21e6f2dc758923 [diff] |
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()