OSDN Git Service

am f13f08be: (-s ours) am fe6fc96a: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Wed, 29 Jul 2015 14:36:40 +0000 (14:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jul 2015 14:36:40 +0000 (14:36 +0000)
commit6e639eec1211977e521189b1a00be28f4c1def2a
tree98b024cd747e6e3194a415e66e264f86444aeee1
parent034b6801f4a42522c2493d3f3df2c7596c183de6
parentf13f08be291ff5cfe52b6fc99112e533698af41a
am f13f08be: (-s ours) am fe6fc96a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'f13f08be291ff5cfe52b6fc99112e533698af41a':
  Import translations. DO NOT MERGE