| commit | b67bf196fef5832f45a08e249c7cc99845da41ec | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 22:11:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:11:03 2015 +0000 |
| tree | d14ba40cf46738e40d7947a078dd587dfb440fba | |
| parent | 4d3109859d5a8716f5701144696c46ce72633e84 [diff] | |
| parent | 0f041b2ebbb6fbd84803e818f065db9d0e299823 [diff] |
am 0f041b2e: (-s ours) am 9e6f5d27: (-s ours) am c7386917: (-s ours) Import translations. DO NOT MERGE * commit '0f041b2ebbb6fbd84803e818f065db9d0e299823': Import translations. DO NOT MERGE