| commit | 11811612e8411f926d7f325be6321316a4e10f6d | [log] [tgz] |
|---|---|---|
| author | Dmitri Plotnikov <dplotnikov@google.com> | Fri Jul 16 11:21:00 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jul 16 11:21:00 2010 -0700 |
| tree | 47f776ecd67f51d35b6e8c281b90f435fe79206c | |
| parent | 6b477fe45256d11c05c21aadbb20481c1e7c3ec3 [diff] | |
| parent | 86fe839284277eeab5cb4272392bd004822edec8 [diff] |
Merge "Resolving a field naming conflict caused by the table join."