OSDN Git Service

am a6e7b3ae: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev...
authorGeoff Mendal <mendal@google.com>
Mon, 19 Oct 2015 16:02:57 +0000 (16:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Oct 2015 16:02:57 +0000 (16:02 +0000)
commite0f00d04d4d68348a8baf03f3c51521389aff576
treef39742409d4203fc655c1fc0551b55a1d9fb3282
parentffdbfaaff2f5172fc0af8d5f13ec3fad0c53f826
parenta6e7b3ae756946212937054bb079da1d472c0cda
am a6e7b3ae: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 7ba59c3559  -s ours

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