OSDN Git Service

am 35e01bf7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev...
authorGeoff Mendal <mendal@google.com>
Mon, 19 Oct 2015 14:33:34 +0000 (14:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Oct 2015 14:33:34 +0000 (14:33 +0000)
commitb2568ed0d1ae4cdaabcb061b2a503fece4aaa22a
treed3471e5457d7180986c53211145cadf734c8ad96
parentca059bfb439df9db2c4ee2f7d860e8a29bf0a91f
parent35e01bf70f560c3651ae34968cd1082cb2dd8536
am 35e01bf7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 84c62dde3d  -s ours

* commit '35e01bf70f560c3651ae34968cd1082cb2dd8536':
  Import translations. DO NOT MERGE