| commit | 394cceda526494e2792e5cc4701f70d81bcbf208 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Oct 16 18:05:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 16 18:05:18 2014 +0000 |
| tree | d8f539b7df2c8922fec20649296bb7b53d30a183 | |
| parent | 70111a429d6da51ffd1790eb767086acada2dabe [diff] | |
| parent | a9e131ce28129f3a3db8d6d03eb69e1ce6836bb5 [diff] |
am a9e131ce: (-s ours) am c218d8f1: (-s ours) am 00e4d783: (-s ours) am c71a7b3c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'a9e131ce28129f3a3db8d6d03eb69e1ce6836bb5': Import translations. DO NOT MERGE