tree cc6cfc276aa5beb9fcd4fd5e84742b85e5dad9fa
parent 21c0800f71c75d7bc38ca6dbc69fd8d10f175dcb
parent c535f7f291f0bda688efcee62f21cf44d0ebe38e
author Mike Lockwood <lockwood@android.com> 1304524649 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1304524649 -0700

am c535f7f2: DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"

* commit 'c535f7f291f0bda688efcee62f21cf44d0ebe38e':
  DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"