commit | 4ce21e02acbd5fdf1d4256f831088dd65dd3e9e7 | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Tue Nov 15 13:10:59 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 15 13:10:59 2011 -0800 |
tree | 5f5b992e548da529c6732d1729a4459cd217caa4 | |
parent | be05b87c5a3e1afd0d2ac954b25476d47434a7e9 [diff] | |
parent | 6b932a450a982f53bb092ce283a6b6bd410113e9 [diff] |
am 6b932a45: Merge commit \'d44ce11e\' into nov15-conflicts * commit '6b932a450a982f53bb092ce283a6b6bd410113e9': Import revised translations. DO NOT MERGE