| commit | fe39cb55712ae1f431bf6426297978914f1aa3e3 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue May 29 11:55:56 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 29 11:55:56 2012 -0700 |
| tree | 90c536de4b7afdaa8adc8e57525649a9e3ba06f3 | |
| parent | ab8f7cd1c7be4553e522e4475592ddbb7fb12fdb [diff] | |
| parent | d4ed01fe6e7f98895b31d727000ada5a53234f02 [diff] |
am d31562a6: (-s ours) am fd08e675: Import translations. DO NOT MERGE * commit 'd31562a6fdccf6d1b37264c90a623b6c790e9241': Import translations. DO NOT MERGE