| commit | 2343e69a8e20b5372c670652fa5befc013ded3d6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 12 23:12:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 12 23:12:00 2015 +0000 |
| tree | 2b0443778f446ed62174af3633d69cf14fe3e540 | |
| parent | e2d143a1cc5ad76736ac746acf6a08330abe04d3 [diff] | |
| parent | f23a517add2ad6c587bcfa691a1ac048818a39de [diff] |
am f23a517a: (-s ours) am dc43cc88: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev * commit 'f23a517add2ad6c587bcfa691a1ac048818a39de': Import translations. DO NOT MERGE