am 214ffc08: (-s ours) am 039e92f7: (-s ours) Import translations. DO NOT MERGE

* commit '214ffc08171a339fa3bbcec8032c06f171c21588':
tree: 75f4c104332cf3641fe278cf4c2d389a8fd4598f
  1. art/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml