commit | 3d13b48fc8d644cab50c3fa8d3cf28c947eda5a4 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Mon Sep 09 22:02:03 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 09 22:02:03 2013 -0700 |
tree | 93608c15859763284d7d228d4e2ad9839722c5b9 | |
parent | 213a488e3894a618c31f89407c8521d8e61105ef [diff] | |
parent | 662c152807bfe2795aa6659611a097c9aa4667c3 [diff] |
am 07df160c: (-s ours) am d4bd945b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '07df160c249064e828eea78e3e1f4bef80948b0f': Import translations. DO NOT MERGE