commit | da4dd61920085fa79026323f636bce84d50fd17a | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Thu May 17 15:32:14 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 17 15:32:14 2012 -0700 |
tree | b554683ac4a4e751e77359d11b647d0acfdc1af8 | |
parent | fd7134d510a1cd091a56376e6e9ec328fb2e9a02 [diff] | |
parent | 5ed46db21536d86eab824d9a8571341e8efb720c [diff] |
am 5ed46db2: (-s ours) am c88b099d: Import translations. DO NOT MERGE * commit '5ed46db21536d86eab824d9a8571341e8efb720c': Import translations. DO NOT MERGE