| commit | 27259b53e6db8781ef7aea614298d50bf26d30e4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 17 20:46:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 17 20:46:32 2014 +0000 |
| tree | 6c14d13d0f5b7d9afb5bde24df11745d7368bf96 | |
| parent | c07376380f566e241dd4ba85a23ff791bdea1524 [diff] | |
| parent | c8131cb90e92b08cbfdc99690a5b5fa6a5e9cc48 [diff] |
am c8131cb9: (-s ours) am e8de72e5: (-s ours) Import translations. DO NOT MERGE * commit 'c8131cb90e92b08cbfdc99690a5b5fa6a5e9cc48': Import translations. DO NOT MERGE