commit | 37cbe67463cad6dfe0b7eafd51130d9d196adf61 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 21:59:46 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 21:59:46 2015 +0000 |
tree | 29d369b8645f0e78a8818f1bb97c3816ef652181 | |
parent | 95ec73f94b9a779dc4f85cecb31add779146b7c2 [diff] | |
parent | 2a9bd871943b9cce5cb127cea1a5950929d0e883 [diff] |
am 2a9bd871: (-s ours) am cd64ce87: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '2a9bd871943b9cce5cb127cea1a5950929d0e883': Import translations. DO NOT MERGE