| commit | 5520345d09600f0940b064840682cd9b751890ee | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 22 22:41:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 22 22:41:26 2014 +0000 |
| tree | fa2094cdf40e42020af77110031edbadc1b2ccd4 | |
| parent | 8a881b8bb12ae3feacf0ef684cc8dccdb91753d7 [diff] | |
| parent | 968db6568acfc34568bddd5f6576cab0d518ffa3 [diff] |
am 4d026aef: (-s ours) am d7e572ad: (-s ours) am 5530019a: (-s ours) am 14558de5: (-s ours) Import translations. DO NOT MERGE * commit '4d026aef5bf131656d1abd40fd46849ce5f58ab2': Import translations. DO NOT MERGE