am 7671cb22: Merge "Split strings with SD card references into variations." into gingerbread

Merge commit '7671cb221465aa52245f57ef9c6bc252d9340341' into gingerbread-plus-aosp

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