commit | cd38106a634960f42c282bcc1aab79270cecee78 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Tue Oct 14 00:24:03 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 14 00:24:03 2014 +0000 |
tree | 6590616d12c51c93b1264c00381f70f77e4e168a | |
parent | 1602b0f8d0ccbdedb5406a5d427c777c5d8b39b5 [diff] | |
parent | d112c2a3659cdb253d7ed651db85417a8f72300e [diff] |
am d112c2a3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'd112c2a3659cdb253d7ed651db85417a8f72300e': Import translations. DO NOT MERGE