commit | 64f13787caf4964178730a06baa26f4a71806ceb | [log] [tgz] |
---|---|---|
author | Ying Wang <wangying@google.com> | Tue Jun 12 13:15:22 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 12 13:15:22 2012 -0700 |
tree | 7f375719d623cd63c42f5c7852aa2da2bbf24e27 | |
parent | 98774f622c1455e1d77888874cb152577f81fe43 [diff] | |
parent | 4b9d76ce80f50c6b708a558c26ff0028cf362d3f [diff] |
am 295c2453: (-s ours) am 6dd67099: Import translations. DO NOT MERGE * commit '295c2453f820709b8aa2a431940af1020d2de585': Import translations. DO NOT MERGE