commit | efab27e125c1d36d905250108a59fb23c595d321 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Mon Oct 07 17:06:49 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 07 17:06:49 2013 -0700 |
tree | 6510a6e902da44e1cecd6d4a9e47a7aaaba76ca8 | |
parent | b2f61fee12512791367df2270de18c99cf57ce6e [diff] | |
parent | 3d77b4019bf29b7a652ee3eb1258487adf537ac6 [diff] |
am ceb436ec: (-s ours) am 29cd41db: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'ceb436ec46546714fdc59fb40886658e49879eeb': Import translations. DO NOT MERGE