am 42d436c5: am 2620516f: am ee163fa1: Merge "Bidi-format joined strings." into mnc-dev

* commit '42d436c5173ea14ab9c2f6bdce9628dab4de243d':
  Bidi-format joined strings.
tree: 09739355353817d1eed28ac6ba709aaeae29d54e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags