| commit | 04a8eedf17a15df25b9ae2f3791b1114390931c7 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 13:44:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 13:44:30 2014 +0000 |
| tree | 7cdc75352d962379cacc969303b930426ccd78ac | |
| parent | cf110592433bfc5abc91529ab0a8cb7ebbd5c459 [diff] | |
| parent | 90361f11130543944895f904f7180f2f9a3b50be [diff] |
am 58ae133a: (-s ours) am ef6c6c6f: (-s ours) am fd052e05: (-s ours) Import translations. DO NOT MERGE * commit '58ae133a9baf4181c8ec85d234d078257803af89': Import translations. DO NOT MERGE