| commit | f54e6183b3e55f9df2e509f6fcd4c34eb2810589 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 06 15:16:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 06 15:16:27 2015 +0000 |
| tree | 1cbca3c8eed2920ad7da36ff989a6862aa587f79 | |
| parent | 19d985fd21c6a9652c1b642bb0b4e6903a26d2e6 [diff] | |
| parent | 4c131aee495878c951b002d5b5ac3e11e360952a [diff] |
am 4c131aee: (-s ours) am 0b3c126d: (-s ours) Import translations. DO NOT MERGE * commit '4c131aee495878c951b002d5b5ac3e11e360952a': Import translations. DO NOT MERGE