| commit | 7e92bb87239af19b3ac3055d40067d6296adcc1d | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Thu May 17 15:32:11 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 17 15:32:11 2012 -0700 |
| tree | 26fbd82e82f375cb632a2b61d5539f5fb1455fc5 | |
| parent | 28077d2765ad649eb098a075c0004a2879f637f9 [diff] | |
| parent | 01d8880cd45f72f20c9c7a0be0bdc09e9463cce5 [diff] |
am 01d8880c: (-s ours) am 517705de: Import translations. DO NOT MERGE * commit '01d8880cd45f72f20c9c7a0be0bdc09e9463cce5': Import translations. DO NOT MERGE