| commit | bbf9af0cf19e34863d0d6a2c3b7d605207570f75 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 17 20:47:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 17 20:47:14 2014 +0000 |
| tree | b2099f54f527daf937f8be0e6f7a414473837890 | |
| parent | 73a950602aa1bb90bbde92ddc9e5e0956f8f1124 [diff] | |
| parent | 6ab691b69ea9bc879c7ff854b5eb4f49cf0c864c [diff] |
am 6ab691b6: (-s ours) am f57c1564: (-s ours) Import translations. DO NOT MERGE * commit '6ab691b69ea9bc879c7ff854b5eb4f49cf0c864c': Import translations. DO NOT MERGE