| commit | fdcd2660ec4e45b957b085d0814fd4f405675504 | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Fri Oct 08 09:20:57 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Oct 08 09:20:57 2010 -0700 |
| tree | e97cb82084fdcee0a1a7be57a606c2185ecb77b9 | |
| parent | e7aa07852dc5d360d223301d1415b87cddc57c99 [diff] | |
| parent | cf1e925aa1691fc1daa94e763be7cd8804ea7481 [diff] |
Merge "resolved conflicts for merge of ba04dbc6 to master"