| commit | c2089c4172fae3ec54aca2ee9bbf4a1919d5c9e5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:21:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:21:23 2015 +0000 |
| tree | 8924d31ff2ecb8b544ab35dab62f515aac397156 | |
| parent | 147ef4743d8ae120028c7286d37cba58a2c0d43e [diff] | |
| parent | dbb3ae893810d7d81c1b138c7307157047a257b5 [diff] |
am dbb3ae89: (-s ours) am a8f551b5: (-s ours) Import translations. DO NOT MERGE * commit 'dbb3ae893810d7d81c1b138c7307157047a257b5':