commit | f81efca101f19f5801671e30caf25c0e8e3f22e8 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:37:12 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:37:12 2015 +0000 |
tree | 156318d1e7602a679e0bb7d9834512a17995ea14 | |
parent | 417f375851d1808dcea9a9b301c9055e49f99914 [diff] | |
parent | 751f64dfe244888f0ec3ef69a2c60df292b8fe64 [diff] |
am 751f64df: (-s ours) am 4a44f433: (-s ours) am d6cba73e: (-s ours) am c8e261e9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '751f64dfe244888f0ec3ef69a2c60df292b8fe64': Import translations. DO NOT MERGE