OSDN Git Service

am 6de722ad: (-s ours) am 46c5d0b1: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Fri, 27 Feb 2015 00:50:50 +0000 (00:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 27 Feb 2015 00:50:50 +0000 (00:50 +0000)
commitef65538a7065d4caa4a3c5aae156d82645611277
tree1bf933ea1eafaf54e768c580fdda84e590c3d474
parent1e711d996936fa1fec356e3f24384d5613ba2688
parent6de722ad64d29f2268f44a5aee61e4dd2685c450
am 6de722ad: (-s ours) am 46c5d0b1: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '6de722ad64d29f2268f44a5aee61e4dd2685c450':
  Import translations. DO NOT MERGE