commit | f07db6772496467cadc31832373c303d2363e05e | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jun 29 16:58:08 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 29 16:58:08 2015 +0000 |
tree | 466f7ab9b9ebd5f5690f5d06f07c4200cc3d7385 | |
parent | 7b3550c09a3e9c27ca8924721efe8efe1a316f48 [diff] | |
parent | b05e2286a9c4517480aca398fcc2e0ee55dfb6ed [diff] |
am b05e2286: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'b05e2286a9c4517480aca398fcc2e0ee55dfb6ed': Import translations. DO NOT MERGE