| commit | 7bb5a9831f21fc37188d1b857eb53840b27d2f20 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:16:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:16:23 2015 +0000 |
| tree | 5790008aa949ab3f982a6b6f114152e972156e6b | |
| parent | dc44b70a454cc91d8cb39e9d3c9108ae1983a776 [diff] | |
| parent | 321c2d47771961de3b049afbfeebbc890b6cc20d [diff] |
am 321c2d47: (-s ours) am 1074d6d4: (-s ours) Import translations. DO NOT MERGE * commit '321c2d47771961de3b049afbfeebbc890b6cc20d':