commit | 6679c489172907376c6ad341fd626ffdeb5042a8 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:18:54 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:18:54 2015 +0000 |
tree | 19ab8bca32a31b13d1cd672de84982b6d85cb8d4 | |
parent | 645bce36004da5b3fa1df514bf58b356c99260f6 [diff] | |
parent | 391e4c0adc0c65c550cbe6b4e4abd978b4dfef95 [diff] |
am 391e4c0a: (-s ours) am bb3a3312: (-s ours) Import translations. DO NOT MERGE * commit '391e4c0adc0c65c550cbe6b4e4abd978b4dfef95':