| commit | 465d16d4366e1f4c64f48a8873e6775f8cb8d118 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 20 22:25:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 20 22:25:50 2014 +0000 |
| tree | 98b7c1fad6d309c425feff705c757b24c985a2b8 | |
| parent | 92251c5c21008a70d132e43f0abc0c1787483814 [diff] | |
| parent | a7992209d7a9ad43727700d9cf8e4611f618ac2e [diff] |
am a7992209: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'a7992209d7a9ad43727700d9cf8e4611f618ac2e': Import translations. DO NOT MERGE