| commit | 7f55e9685e11a664e2759a60d719cc2a58a6a400 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Dec 30 12:14:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 30 12:14:29 2014 +0000 |
| tree | 3b878d445d13efa6341b143ad609212c33e4d0d9 | |
| parent | 0223c588de5cc73e5dcf8cd5d81da24990cff3b0 [diff] | |
| parent | c0b5d542b6f68dfcd0c90496d487986c9727da84 [diff] |
am c0b5d542: (-s ours) Import translations. DO NOT MERGE automerge: c3068f0 -s ours automerge: 9602ba3 -s ours * commit 'c0b5d542b6f68dfcd0c90496d487986c9727da84': Import translations. DO NOT MERGE