commit | 2875b6dd763d3ede9d20dc6b3806b0e6208e6a55 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 08 17:51:22 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 08 17:51:22 2015 +0000 |
tree | be5f7e7d72a7982bf4499da1eb388d7747a630d8 | |
parent | 81105a9fc670a46a2b6f2e7763c4d36c876dc78e [diff] | |
parent | cdbfad196137eafcef7f63182c308e020ef8c4d4 [diff] |
am c8da7d53: (-s ours) am 3c573bc5: (-s ours) am 4f5630e5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'c8da7d5366ee92a81d92d7e5c18fd769a1961032': Import translations. DO NOT MERGE