| commit | 0223c588de5cc73e5dcf8cd5d81da24990cff3b0 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Dec 30 12:14:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 30 12:14:28 2014 +0000 |
| tree | 3b878d445d13efa6341b143ad609212c33e4d0d9 | |
| parent | 002b571f74a66e5c3ca7ccb4c0c378ae35cecae0 [diff] | |
| parent | 617918d61b3023d2f6910b4097ea1b772612372c [diff] |
am 617918d6: (-s ours) Import translations. DO NOT MERGE automerge: ad3b94f -s ours * commit '617918d61b3023d2f6910b4097ea1b772612372c': Import translations. DO NOT MERGE