| commit | 91024f55de91db0d9124605b0bedf778fb65c6ae | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 19 15:37:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 19 15:37:07 2014 +0000 |
| tree | 1ccc64274562901c7ab1a335dc79a3061628d55d | |
| parent | 9942a7619f4c2371c8b802a3f4107b7d35d6665c [diff] | |
| parent | d896f661e370b59fae65b9be6ce52c88e9fb4a42 [diff] |
am d896f661: (-s ours) am 4dbd3a23: (-s ours) Import translations. DO NOT MERGE * commit 'd896f661e370b59fae65b9be6ce52c88e9fb4a42': Import translations. DO NOT MERGE