commit | 551deffb7679e893ee8df750914cdb978bf2afb5 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Oct 16 17:45:45 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 16 17:45:45 2014 +0000 |
tree | d645b3f54be23ed2a6fc0b3ebed5d137d2c02eee | |
parent | a2d77ed7d7abc1cf10fb961dd8a64f3a9e323736 [diff] | |
parent | fb0356852dad1daeb673cdf117193a8421f66aaa [diff] |
am fb035685: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit 'fb0356852dad1daeb673cdf117193a8421f66aaa': Import translations. DO NOT MERGE