commit | e62721e9826e0b2ae45ab500cf747501e21c16bd | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Fri May 25 14:22:35 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 25 14:22:35 2012 -0700 |
tree | 8312bb3a541ff6f77568e2e9532c759aa38ca6e8 | |
parent | 003662cc507a24c647280fe5a691c62583e1d922 [diff] | |
parent | b6bca587fac387a536f68e22610dc7ebee0e76e7 [diff] |
am 90817b80: (-s ours) am 8c2158e5: Import translations. DO NOT MERGE * commit '90817b8067ee76c0714b97ef93a0fab8d18b2116': Import translations. DO NOT MERGE