| commit | ecd5556114bdb79e6d4d30c6761cbee3c62e22a9 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 19 18:05:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 19 18:05:19 2014 +0000 |
| tree | 6fbfc9a36c53a4702a7fd4ab71a50ec1dbe4bc72 | |
| parent | c4b41f565a35f00412eecbfacfb606c3bfa08956 [diff] | |
| parent | e409561a1757cd9004e50ce5ab3c4e29a747a3c5 [diff] |
am e409561a: (-s ours) am cfe34ebc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit 'e409561a1757cd9004e50ce5ab3c4e29a747a3c5': Import translations. DO NOT MERGE