| commit | 299e43ffeb1dc9729debe3966a01df914b60a5e8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 09 16:20:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 09 16:20:11 2015 +0000 |
| tree | 0792d97204a55d469a0e42a1c9e387f891f6a6a3 | |
| parent | efce000e1217c1322f11ea0f296b33e6bb3ac4a3 [diff] | |
| parent | 2151095bb20854b31535de16bfd6c963d9c5d922 [diff] |
am 2151095b: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '2151095bb20854b31535de16bfd6c963d9c5d922': Import translations. DO NOT MERGE