OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
authorBaligh Uddin <baligh@google.com>
Thu, 5 Nov 2015 19:42:53 +0000 (19:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 Nov 2015 19:42:53 +0000 (19:42 +0000)
commitcb60be1c2ab9ce4bd19250d544b2afb29a6e5f3d
tree58c89436dda888768189aa449eed2abf99f15cb1
parentb4b53b0741b6ff75842d6630d5d1010c4efa766c
parent31f0d18a03115ba4a112af14fd007a2e9e7c4d72
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 31f0d18a03  -s ours

* commit '31f0d18a03115ba4a112af14fd007a2e9e7c4d72':
  Import translations. DO NOT MERGE