| commit | c1f4c0fefebfb296846e88324c1bb7dee6b5c876 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Oct 09 13:04:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 09 13:04:23 2014 +0000 |
| tree | deff71b24616e89995efdbe6fe10efc60ef370ce | |
| parent | 00c1c564b0edca42093febf9e3f789cb9ae75d9d [diff] | |
| parent | e73bb6e059dbd073b09246471b332b6b0e72f191 [diff] |
am e73bb6e0: (-s ours) am 49c5ddd6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'e73bb6e059dbd073b09246471b332b6b0e72f191': Import translations. DO NOT MERGE