| commit | 20c12f8de5885c320592927eb4bded607bbbf2ce | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jan 05 17:21:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 05 17:21:56 2015 +0000 |
| tree | 50e7c13cd04bfcdd39921a4d3b8ee4cdee75ed46 | |
| parent | 92852b4deecf7ee778de6a177b3144f079d92379 [diff] | |
| parent | 23e92a56575a4ae926a235b7ee2938c2c1a50feb [diff] |
am 23e92a56: (-s ours) am e0fb4040: (-s ours) Import translations. DO NOT MERGE * commit '23e92a56575a4ae926a235b7ee2938c2c1a50feb': Import translations. DO NOT MERGE