| commit | a6315bde9d4d696a1b23aa1d5be1511ec9a21aed | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Mar 04 13:54:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 04 13:54:47 2015 +0000 |
| tree | 2c865b98b8cb52f3faa81f149b99f1467789d3d6 | |
| parent | d1c5ae486dc09d10dffaf138c98ad6daed182993 [diff] | |
| parent | a07520f6888981f4e310aa3c3c49ff6ea04b51d0 [diff] |
am a07520f6: (-s ours) am ba5c9ed1: (-s ours) Import translations. DO NOT MERGE * commit 'a07520f6888981f4e310aa3c3c49ff6ea04b51d0': Import translations. DO NOT MERGE