| commit | 8cad9c8b7fa0f0ee9800f6c5b1f4f880b175a324 | [log] [tgz] |
|---|---|---|
| author | Nicolas Roard <nicolas@android.com> | Tue May 11 10:42:41 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 11 10:42:41 2010 -0700 |
| tree | d0626926c0e879e00b323132b1c6eafab0ea9bbc | |
| parent | c75bb89b37ab523cdd0da5e44dd6e9339fcaae71 [diff] | |
| parent | c7d2e82e7f55556cbcdb4f5b9c3eba403c1e72e7 [diff] |
Merge "resolved conflicts for merge of bfd6805a to master"