| commit | 7a6396ce19e7fee30589c65c5bedecf86b752904 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 26 18:44:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 18:44:05 2014 +0000 |
| tree | 0704082f6023aa4a254e32609792141d1b887433 | |
| parent | 588f889c2569502bffece8778880bda73bc9c270 [diff] | |
| parent | fec29c6b6d773fde40a3702c5512748952a13e99 [diff] |
am dcefa462: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit 'dcefa4620fd1bf6a6d1f03d6ac22a611ad0c2b21': Import translations. DO NOT MERGE