| commit | 18c13ccdd62311c09c40077224392f2b5b52e679 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 27 00:43:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 00:43:40 2015 +0000 |
| tree | 3c7fbcbb6941c483dbceb6641866c3ec36186a33 | |
| parent | b92f64c6fdb1cfb49915596f060803a7ff0477ae [diff] | |
| parent | b0910bf2db86ea93883e77f97b7a511d15189185 [diff] |
am d0625ced: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit 'd0625cedca001cad32767cb834e71508d6013e68': Import translations. DO NOT MERGE