commit | 2f3c30e758f343f17b61600642ae4637a35dd829 | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Tue Nov 15 13:11:00 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 15 13:11:00 2011 -0800 |
tree | 8c026255fa5248456160f60dc0f524cf7d785ded | |
parent | 86e099843c5edbba003c00e6eb44c1b65065b6d9 [diff] | |
parent | ef6f60fe9b8a1f3426835b35f579ce5980d4ca33 [diff] |
am ef6f60fe: Merge commit \'e9d96b1a\' into nov15-conflicts * commit 'ef6f60fe9b8a1f3426835b35f579ce5980d4ca33': Import revised translations. DO NOT MERGE