OSDN Git Service

am 84cd5f64: (-s ours) am e74331dc: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 23 Feb 2015 14:32:42 +0000 (14:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 23 Feb 2015 14:32:42 +0000 (14:32 +0000)
commit9dd645bdd0512456860a0fec66351dfed966b8c0
tree8c7f309be6c6cb6fed17837c1ee688d643023360
parent0c2de5faa50ed01dda4d2ad14666d64e2dd8c9ca
parent84cd5f64c340067b1a8e3e7a7c7d1e86ca155313
am 84cd5f64: (-s ours) am e74331dc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '84cd5f64c340067b1a8e3e7a7c7d1e86ca155313':
  Import translations. DO NOT MERGE