| commit | ac4998468f4496cdd162e7b66f4c0ca65192e7a0 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 13:24:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 13:24:39 2015 +0000 |
| tree | d711ceb0d79ca9b713de0554326541371cd0a056 | |
| parent | a467ef272a58e0c4c65c1eac51f6e7f244160fb5 [diff] | |
| parent | cf3020f95e85c19bd9e4a584e7dfaf6b1cfff943 [diff] |
am cf3020f9: (-s ours) am 80e8b68e: (-s ours) Import translations. DO NOT MERGE * commit 'cf3020f95e85c19bd9e4a584e7dfaf6b1cfff943': Import translations. DO NOT MERGE