am ee163fa1: Merge "Bidi-format joined strings." into mnc-dev

* commit 'ee163fa1ac6477da543568053f8b81f3d5006374':
  Bidi-format joined strings.
tree: 899b9e315be5dd854a9097057983f2f5a71ba621
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags