| commit | 32cd7e5da2f0ad91eb11d77cf34deb72945ca527 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Jul 06 18:33:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 06 18:33:22 2014 +0000 |
| tree | 4b1bf7c43eddc14cd87697d9c76cfa60d96cc073 | |
| parent | b7c933f95da5c4c2742823d8e0aec7b0e2feb4fa [diff] | |
| parent | 82a702c81db962e2cbed095aae41223fc79ef352 [diff] |
am 3b7b9f95: (-s ours) am 334c84cf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev * commit '3b7b9f95a920e9b97067bc8004bd96156bcd8f7e': Import translations. DO NOT MERGE