| commit | f8b7897bd17ca42ed16a5fd21033fd18d0579dc5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Apr 28 15:16:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 28 15:16:50 2015 +0000 |
| tree | a8b3e52ddd3e90f61a2ef439d20cfd2447863bec | |
| parent | c64ec04a9aae848835cf7bdbe8e175a623deccf5 [diff] | |
| parent | e339075aa2f9f614419bcbdefbacd3b507ea0551 [diff] |
am e339075a: (-s ours) am c0aba5f7: (-s ours) am 5e43ae9c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'e339075aa2f9f614419bcbdefbacd3b507ea0551': Import translations. DO NOT MERGE