| commit | 5b3e66d0f65f08de89980700f0b4f0764ae85bce | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Jul 01 18:14:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 01 18:14:40 2014 +0000 |
| tree | e7aad5d9e07b6e64dfc4a8481b075afc576bcda5 | |
| parent | 3bb733baa2dc85ffb24a1e1d286a51ba7611dcac [diff] | |
| parent | 9846e4c676e9b1b656081bab3f9cb304f8cc3cdf [diff] |
am 9846e4c6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '9846e4c676e9b1b656081bab3f9cb304f8cc3cdf': Import translations. DO NOT MERGE