commit | 6cbdf17e7b8244601174295d2ddeb333c073cfc4 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Mon Sep 29 20:41:53 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 29 20:41:53 2014 +0000 |
tree | 7daf10ddba4799cecb69c50fa78f3a73a9fad9fb | |
parent | dc5f87fffceac79169fe546055f2ecc3a4142bfe [diff] | |
parent | 5c664d8e20e2b093f7602f8114e26a4c97f45ebd [diff] |
am 5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '5c664d8e20e2b093f7602f8114e26a4c97f45ebd': Import translations. DO NOT MERGE