| commit | aad2314b1a962f6a46d54cc25aa385285fbd6e29 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Dec 05 22:45:01 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:45:01 2013 +0000 |
| tree | 6aef210f7802c8cc78b08488cedda081cef6f3e4 | |
| parent | 633604af9c2359b9c6a4ee9c20dd743fdfee3ede [diff] | |
| parent | 4c0c5f46a21b30383fef933facd37f38df973930 [diff] |
am 113d77c7: (-s ours) am 779660c9: (-s ours) am 77758fae: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '113d77c797f6fa5e0baaaf8646ee9afca799e73e':