commit | 687b662cf72ac61dc40173572581a9bc17750922 | [log] [tgz] |
---|---|---|
author | Ying Wang <wangying@google.com> | Tue Jun 12 16:38:34 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 12 16:38:34 2012 -0700 |
tree | 0ae81235d2d294b6cee396d66a24fbcec3172df6 | |
parent | 7b680585ae60960552717d05813f9348edde0684 [diff] | |
parent | 23e90f663d994e75743e4b6096b6622c2e5b1594 [diff] |
am 23e90f66: (-s ours) am 9ff5b647: Import translations. DO NOT MERGE * commit '23e90f663d994e75743e4b6096b6622c2e5b1594': Import translations. DO NOT MERGE