| commit | 0134869b5c81771ae3e3251fa42ac6c478e62f5a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 16 13:07:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 16 13:07:29 2015 +0000 |
| tree | 720a632db04812a6c5422c68b70ff6957e31c600 | |
| parent | 3437d9e716e477d407dfc13cc797500e6421e464 [diff] | |
| parent | 74c66d10a7b2237f8aaf8c10675a10b9347860f4 [diff] |
am 74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '74c66d10a7b2237f8aaf8c10675a10b9347860f4': Import translations. DO NOT MERGE