| commit | 57e8ed4421473404e7f140bbe570324372150153 | [log] [tgz] |
|---|---|---|
| author | Marc Kriguer <myk@google.com> | Wed Dec 04 13:27:58 2013 -0800 |
| committer | Marc Kriguer <myk@google.com> | Wed Dec 04 13:27:58 2013 -0800 |
| tree | e2c9b6c449f4f519455429dba3e845607bf5d30a | |
| parent | 803ccf37b779889c82abc7f8d641a350e7ad9296 [diff] | |
| parent | 9a5f7b5b71e5231a92d613f7ba6ffd389aa11902 [diff] |
Merge branch 'master' of https://code.google.com/p/plexi.ad Conflicts: src/com/google/enterprise/adaptor/ad/AdEntity.java