| commit | ba1ab4e94654b8d514de79ba8484e5f14fee862d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Oct 19 19:57:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 19 19:57:45 2014 +0000 |
| tree | f8d4c47ceeee50d33fc48df1436cf46d31575fb1 | |
| parent | e508ee3d95b2b80a35074dc21a3a480652005c7f [diff] | |
| parent | 7fda5c91e5cb77e29852dd093bbbe0a2667cf2c7 [diff] |
am 7fda5c91: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '7fda5c91e5cb77e29852dd093bbbe0a2667cf2c7': Import translations. DO NOT MERGE