| commit | 4c0c5f46a21b30383fef933facd37f38df973930 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Dec 05 19:23:21 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 19:23:21 2013 +0000 |
| tree | 09e94e43bd77e4f88e56a7d3340dda4f97360adf | |
| parent | 85ee337fe5f7f2e28019abbe4983ec9fe49afce0 [diff] | |
| parent | 70725fcd67fca1b421b469a8384ae43b513b8104 [diff] |
am 779660c9: (-s ours) am 77758fae: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '779660c9625a346590ca6ebcb87c17c24b03521e':