| commit | e02efb2372b73b9033fa7f56413c64e8336dd32b | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 02 09:43:06 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 02 09:43:06 2013 -0700 |
| tree | 644d34866b42710264a3a58aae4b847f230d654f | |
| parent | b61d31aea213421457809d2395509589bcfccac7 [diff] | |
| parent | a8a587eff9875d0bf68101fe87e3fd03637543f1 [diff] |
am bcb3643f: (-s ours) am 63bc5d85: (-s ours) am ab705268: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'bcb3643fcedb9c3db5397cafc6873c858d4096cf': Import translations. DO NOT MERGE