commit | 21d4b327496e6d74dcf214ee20be2c864aa90348 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 13 14:30:36 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 14:30:36 2014 +0000 |
tree | 1896fb35993cc028e811e754083a033726fab1c3 | |
parent | 86f6d4cc2351fad120b11bf543047df9b9fa3771 [diff] | |
parent | 757f1135469175d7b7509c2ac88a620b7c189447 [diff] |
am 757f1135: (-s ours) am 2bb933a5: (-s ours) am 862ecfa3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '757f1135469175d7b7509c2ac88a620b7c189447': Import translations. DO NOT MERGE