commit | f61463217947db44ed8dfb488c753a140b143cf8 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Oct 23 11:22:03 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 23 11:22:03 2012 -0700 |
tree | 1dac6d048a9311e1746065f100faebcace4e6494 | |
parent | 6afac8f980f84cedf3727705444cc82e99a7794a [diff] | |
parent | 450fef15a2168d37385bd5664fb5dae20e40fdd1 [diff] |
am 450fef15: (-s ours) am c730c00a: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '450fef15a2168d37385bd5664fb5dae20e40fdd1': Import translations. DO NOT MERGE