| commit | 32aa82223a5e0e5475df81378d0e6715601b2cc2 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Dec 11 13:46:35 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 11 13:46:35 2013 -0800 |
| tree | 2890321c5959f308a4d734feed95d5a9654f0cbf | |
| parent | e30461c07676496e9f848c6ea35e70583cec5949 [diff] | |
| parent | 0a102150448747bcedcd3276740e1adb8130ae03 [diff] |
am 0a102150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '0a102150448747bcedcd3276740e1adb8130ae03': Import translations. DO NOT MERGE