OSDN Git Service

am 74d8ac2e: (-s ours) am 4a332ee8: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 11:31:14 +0000 (11:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:31:14 +0000 (11:31 +0000)
commit62b24c74a9579dc9e76f4de268084ebbffe5f0fd
tree7f84c40aaa75cd61f165f55c1ed04452351a1edd
parent06bb8569a2a8f79ea25d6691cdc56abbd6053e7c
parent74d8ac2e274f0a19f5164191e8dd00dd8e741428
am 74d8ac2e: (-s ours) am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '74d8ac2e274f0a19f5164191e8dd00dd8e741428':