| commit | 7ea45c07558e2fe86a376e76a25c238cd7be06ce | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Mar 27 22:01:03 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 27 22:01:03 2013 -0700 |
| tree | 7511d55a2bd5379f7a5b0e73f67a74184c9daf39 | |
| parent | 599290d53f110c0f6bba91696db0709e10dc1221 [diff] | |
| parent | 7f859d683e5390f9738d375cc6b5fed93ea2c1f9 [diff] |
am 7f859d68: (-s ours) am 8636ba03: am afe343c1: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '7f859d683e5390f9738d375cc6b5fed93ea2c1f9':