| commit | 49a931f81ad02482c661cdaa775530883434dd6f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed May 14 00:07:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 00:07:19 2014 +0000 |
| tree | c2175942e3a631ad112fe6ab17da560c45fc1ae2 | |
| parent | 81525de8c6dcef25aa70e36f1a6fd7cf95758165 [diff] | |
| parent | d678583067bf8c209b9180ba8b9e8627e7d48b3c [diff] |
am d6785830: (-s ours) am 3204ecad: (-s ours) Merge "Import translations. DO NOT MERGE" * commit 'd678583067bf8c209b9180ba8b9e8627e7d48b3c':