| commit | 70c88c7cbe87d4e2d24d4f9080d1f09fa11859fc | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 07 20:45:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 07 20:45:50 2015 +0000 |
| tree | bf39e1db7fc92f3744cc3fe9451fe7d7056b00cc | |
| parent | 439bc06dc0f96ea8677a897285f81e6b3ee3da47 [diff] | |
| parent | a67ba8612f4408c42bb6988304aeb86bd3382796 [diff] |
am a67ba861: (-s ours) am 53d3be63: (-s ours) Import translations. DO NOT MERGE * commit 'a67ba8612f4408c42bb6988304aeb86bd3382796': Import translations. DO NOT MERGE