| commit | 280df74a4e7bfd603054d01f284b674b38e81b0c | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Aug 15 08:02:58 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 15 08:02:58 2012 -0700 |
| tree | a3016828facaf3be79eb0ff3dd3192f7e6252c9b | |
| parent | b683a2d40ffd0908eaf21d66196482a8f96f6c75 [diff] | |
| parent | 011919f2d29aa41fb6638052533bf1d51a2adc0f [diff] |
am 011919f2: (-s ours) am 9056ce4e: am 8ddcdbd4: (-s ours) am 11665038: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '011919f2d29aa41fb6638052533bf1d51a2adc0f': Import translations. DO NOT MERGE