| commit | cda6aa3210225d71304c2eedcfc6094c4d1b8f6f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Aug 27 18:41:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 27 18:41:43 2014 +0000 |
| tree | 9a0d0cef49decab96c9f6e878dc85eb1da90a2f3 | |
| parent | 1f6a5d258762178f25d885ff697b2ed8d7ad8124 [diff] | |
| parent | 6f67018d8d552b530211415f4241f754e5d723f1 [diff] |
am 6f67018d: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '6f67018d8d552b530211415f4241f754e5d723f1': Import translations. DO NOT MERGE