| commit | 736d1c6b7b323fbba072b655301b0fa8e0d0a45c | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Wed Jun 06 13:58:49 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 06 13:58:49 2012 -0700 |
| tree | bbcee3e789592bbb09dd968ae2629f793374b678 | |
| parent | 202c3b8457e8f99362fca1191f631b622040d28f [diff] | |
| parent | 2c7f1325e1c3cd58d16e3b42bc8a752d089fb6c9 [diff] |
am 2c7f1325: (-s ours) am 5ddf003c: Merge "Revert "Import translations. DO NOT MERGE"" into jb-dev * commit '2c7f1325e1c3cd58d16e3b42bc8a752d089fb6c9': Revert "Import translations. DO NOT MERGE"