am e0eb4f15: am 20c4dbd1: Add a locked column to SIM messages

Merge commit 'e0eb4f15b484969e39a099f1a32a7a4ac89df346' into eclair-mr2-plus-aosp

* commit 'e0eb4f15b484969e39a099f1a32a7a4ac89df346':
  Add a locked column to SIM messages
tree: 2fc77eb1afb96cb2444a86cceca4cbbf9d9131dc
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE