| commit | 1c993bfb622d7241dc244495a8add61e957703d1 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Jan 12 11:55:12 2010 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jan 12 11:55:12 2010 -0800 |
| tree | e440180dd27bbcbd7ccfdb7c6b9de2fa2cd9758e | |
| parent | 32db57babe4b6158d167deb5f2d59a24f5b4afcb [diff] | |
| parent | fa101530bc74bdf1517a1840a9415249211b9414 [diff] |
Merge "resolved conflicts for merge of d26707da to master"