OSDN Git Service

am 2e87004b: (-s ours) am 6a836bff: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Fri, 15 May 2015 17:28:58 +0000 (17:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 May 2015 17:28:58 +0000 (17:28 +0000)
commit02ef9b6b8d672f9b8d3b651e2951daa8eff0c3bb
tree7ca3de43edfefe35465d55c7ab45604f4d8ea68b
parentf4ae0efd47c4146f736ae1f6eb935493511b3dcf
parent2e87004beca0c32fc5e56936962a11f56e5b88bd
am 2e87004b: (-s ours) am 6a836bff: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

* commit '2e87004beca0c32fc5e56936962a11f56e5b88bd':