| commit | a88be5304d6ec803f7caa60f0b3515199be6038f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 29 18:39:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 29 18:39:17 2015 +0000 |
| tree | eeb79ec65662b9bf7043804e2fb2e0835805da4a | |
| parent | f6c2d8a9bfb681a40147944c4c6f89d4c2eb76e9 [diff] | |
| parent | de399af72c087cc061144a22f0b29fd8534de129 [diff] |
am de399af7: (-s ours) am 3986360a: (-s ours) Import translations. DO NOT MERGE * commit 'de399af72c087cc061144a22f0b29fd8534de129': Import translations. DO NOT MERGE