| commit | 04b312f1ee06032ddcfea4e74aca996dbc42367b | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Dec 12 17:54:20 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 12 17:54:20 2013 -0800 |
| tree | 00ddb881df5c6c90e0e39ff862edba5e79c2ead2 | |
| parent | 7256b6146b7248f1d624dff9841e8d53a097d8e8 [diff] | |
| parent | 5c47cee0837154f4cd09815c8cfd851af223c809 [diff] |
am 5c47cee0: (-s ours) am 6a8a163d: (-s ours) am d823988b: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '5c47cee0837154f4cd09815c8cfd851af223c809': Import translations. DO NOT MERGE