| commit | 24c2a22a775fe1b8225da45f1e539758a93dc42f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 25 15:08:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:08:46 2014 +0000 |
| tree | 0bc5e7975bab5658b8ace07668a5fd4fee69e2be | |
| parent | f54f7724047040139b5c4b129ccdc8912c29df42 [diff] | |
| parent | a0a8df1302d69e45cc975ad603636635dec7a4ca [diff] |
am a0a8df13: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit 'a0a8df1302d69e45cc975ad603636635dec7a4ca': Import translations. DO NOT MERGE