| commit | 9806c2db770feed9c65af86e0835ed9b4bde3c3e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 03 15:45:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 03 15:45:20 2014 +0000 |
| tree | e671bd677b3e875f0309e141e4d9830cb46126cf | |
| parent | 1ccebc378acc8c1f7a37da512d3b56068c4e89bf [diff] | |
| parent | 034f1da2a136a4cdec4e0fb5ad1672924331c27c [diff] |
am 034f1da2: (-s ours) am f8fd72ea: (-s ours) Import translations. DO NOT MERGE * commit '034f1da2a136a4cdec4e0fb5ad1672924331c27c': Import translations. DO NOT MERGE