am ee60f3fb: resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp

* commit 'ee60f3fb1b4e61ac8027293a658ba710e36d36b6':
  Enable support for SMS national language shift tables.
tree: 8dc1359d81604bdb5b4777aa34558617e3bd1945
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE