| commit | be2d4f99593cf446ede31da28b3ab25a012cdf7d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 18 02:06:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 18 02:06:53 2014 +0000 |
| tree | ae5aca99b530a5f6c985b46b36db3d508da0b300 | |
| parent | 56491f296c17f5cd1119f743d45c4f7a49e3e4a6 [diff] | |
| parent | f17620e3d60e63425bdf3d14ce35116f6981c5b6 [diff] |
am f17620e3: (-s ours) am 383d2ab6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'f17620e3d60e63425bdf3d14ce35116f6981c5b6': Import translations. DO NOT MERGE