tree b6123a4385b96ab13d457b8153fbc99c0644a7ab
parent 7a93f67e130cd9d0972d4f1346c8bcf3250e687e
parent c9c801a48baeed7b5af85e88b69e02444dafabe5
author Eric Fischer <enf@google.com> 1285823568 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285823568 -0700

am c9c801a4: am a26109b2: Merge "Split strings with SD card references into variations." into gingerbread

Merge commit 'c9c801a48baeed7b5af85e88b69e02444dafabe5'

* commit 'c9c801a48baeed7b5af85e88b69e02444dafabe5':
  Split strings with SD card references into variations.