commit | b28985c9ad4431db117f81d2d16e3a7e36bad75a | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:10:47 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:10:47 2015 +0000 |
tree | 138f046870f5f5416367522d116392f120537214 | |
parent | 25a64ced3b5d8d820b59dab82c0513d954dfe223 [diff] | |
parent | b4769f386891b4950cfe29ae0f70c7bb6ce5b7fa [diff] |
am b4769f38: (-s ours) Import translations. DO NOT MERGE * commit 'b4769f386891b4950cfe29ae0f70c7bb6ce5b7fa': Import translations. DO NOT MERGE