| commit | a58519fd064bbe30a4bf729377ce5401139d5ec2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 22:05:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 22:05:01 2015 +0000 |
| tree | 36aef968cd6bf136e35dd163bafe3b05519412c2 | |
| parent | ef448f82535c14eb43e0ac7153208bfcfc9ccffe [diff] | |
| parent | bd7d5342fdf4a3d2bcd880d111cb6a23395541ab [diff] |
am bd7d5342: (-s ours) am c1f028fe: (-s ours) am c362ec4b: (-s ours) Import translations. DO NOT MERGE * commit 'bd7d5342fdf4a3d2bcd880d111cb6a23395541ab':