commit | 2145b3925a5c965e8c07461dd6e1725f8fcd1379 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Dec 04 15:17:29 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 15:17:29 2014 +0000 |
tree | d237d9246e1f9b963d1981f8a951dbae23f8a104 | |
parent | c637febf8893f28a66cc73fb92fc700667be68e1 [diff] | |
parent | 7b79c35186c5e8e6fc4fe6ec9411383253777083 [diff] |
am 7b79c351: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '7b79c35186c5e8e6fc4fe6ec9411383253777083': Import translations. DO NOT MERGE