commit | f48b416e9806f374f95cfcfc35b60db82bb272a8 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 22:27:39 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:27:39 2015 +0000 |
tree | 317a366c1ef24ba5c396b812c2ebff7782ab31a6 | |
parent | 0959738e5c0fda80bb655ae1fe317e3f395c6a72 [diff] | |
parent | a5516e80ad76fb5cfe520ddd0c5babf2dccf2e5a [diff] |
am a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'a5516e80ad76fb5cfe520ddd0c5babf2dccf2e5a': Import translations. DO NOT MERGE