Jake Hamby afd28ac6ec am ee60f3fb: resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp
* commit 'ee60f3fb1b4e61ac8027293a658ba710e36d36b6':
  Enable support for SMS national language shift tables.
2011-05-11 13:09:42 -07:00
..
2011-05-10 17:52:51 -07:00
2011-05-04 14:08:11 -07:00