| commit | 17df9f9e763d48753430e45b65b27637b4cd9a22 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 27 00:50:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 00:50:38 2015 +0000 |
| tree | 1bf933ea1eafaf54e768c580fdda84e590c3d474 | |
| parent | 86398cd9eb172508f02e16dad059d739540b3b54 [diff] | |
| parent | f8b7b16c645896d3f8ef697ee06bbb7bc20921e3 [diff] |
am f8b7b16c: (-s ours) am d307a122: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit 'f8b7b16c645896d3f8ef697ee06bbb7bc20921e3': Import translations. DO NOT MERGE