OSDN Git Service

am a2ab4fc8: (-s ours) am f88916ca: (-s ours) am 197e7381: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 22:57:34 +0000 (22:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 22:57:34 +0000 (22:57 +0000)
commit812ad1aa4e9f0558e800bbc234a278f205b1e8a8
tree18c580693446704f3d1e39d971c7b9d293e4c25b
parent34cfc5c83ddaad59c9aa8cf047b36f73e5dfee65
parenta2ab4fc82629f200d93fa77a29094ff3ecb86af3
am a2ab4fc8: (-s ours) am f88916ca: (-s ours) am 197e7381: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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