| commit | 9bd4074a9924d2a7e9a7a5bd80d930f86a1a25fd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 21:38:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:38:16 2015 +0000 |
| tree | 8e96ee84101322c07b7813c004faf703382c45d4 | |
| parent | 0fc34800656cc51405660ac107936adac31646b0 [diff] | |
| parent | 7bb5a9831f21fc37188d1b857eb53840b27d2f20 [diff] |
am 7bb5a983: (-s ours) am 321c2d47: (-s ours) am 1074d6d4: (-s ours) Import translations. DO NOT MERGE * commit '7bb5a9831f21fc37188d1b857eb53840b27d2f20':