OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
authorBaligh Uddin <baligh@google.com>
Thu, 5 Nov 2015 19:44:14 +0000 (19:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 Nov 2015 19:44:14 +0000 (19:44 +0000)
commitf61a22fe5d974ee568ac5b547a45e93f2b0cbcb2
tree58c89436dda888768189aa449eed2abf99f15cb1
parentcb60be1c2ab9ce4bd19250d544b2afb29a6e5f3d
parent70df552ac2a2154bae5f1420bfd8bbaa4dc08811
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 70df552ac2  -s ours

* commit '70df552ac2a2154bae5f1420bfd8bbaa4dc08811':
  Import translations. DO NOT MERGE