| commit | ca74f32c12bbbe401f0f266751fccd34148229dd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 13 23:56:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 13 23:56:06 2015 +0000 |
| tree | 9c8309876d58ee27a6ea6bf1dc18e9a3ad2ffcde | |
| parent | fa3b7b6ac2e81a989850f0d5d5bc4fba6fd67fff [diff] | |
| parent | 3fc785cea4056dccd516d31bbace37d767ea4a72 [diff] |
am 3fc785ce: (-s ours) am 762b4fd8: (-s ours) Import translations. DO NOT MERGE * commit '3fc785cea4056dccd516d31bbace37d767ea4a72': Import translations. DO NOT MERGE