commit | b10c364f5d2885a4654efacb8d945ede4be40847 | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Fri Feb 10 10:15:47 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 10 10:15:47 2012 -0800 |
tree | 6a66928ba0f67289546e1f12b28b49b6913e7ef4 | |
parent | 987ab85fe13de9ca47bd46ee8c7be7de90ec1347 [diff] | |
parent | 08c629277ed48ca9777e3cb9d783299f9cb885c3 [diff] |
am 08c62927: (-s ours) am 7b6c66d5: (-s ours) am 077cf819: Import translations. DO NOT MERGE * commit '08c629277ed48ca9777e3cb9d783299f9cb885c3':