| commit | 8f6b3cb4a2f5018ebcf87c05ddd058972ebc226c | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Fri Feb 10 10:54:06 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 10 10:54:06 2012 -0800 |
| tree | 7b727d5f17674333fa90c6ff905a5ce42a6a0cee | |
| parent | bbfffe8256db65326201619c4d73487659bf57c8 [diff] | |
| parent | 1f1f4e0913826b29d9227aedc6358f36aeedd1c5 [diff] |
am 1f1f4e09: (-s ours) am 6a5dd95e: am 29e5c899: Import translations. DO NOT MERGE * commit '1f1f4e0913826b29d9227aedc6358f36aeedd1c5':