commit | 5e0def615cb6b66cfe03ec60732240b0a3636227 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:29:52 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:29:52 2015 +0000 |
tree | 5786f3eaf156761d27779e4c4f5bbe6e1e4e4a7d | |
parent | 8f89a1fba49fec29fec935240e5340ae4c979e81 [diff] | |
parent | 8dc4e71009aae8f78f4cb44fd17e1d5365ee03c5 [diff] |
am 8dc4e710: (-s ours) am a5698f20: (-s ours) Import translations. DO NOT MERGE * commit '8dc4e71009aae8f78f4cb44fd17e1d5365ee03c5':