| commit | c8cc6580ebec0a16c799a645e05a2b4e5cb066b2 | [log] [tgz] |
|---|---|---|
| author | Jason Chen <jasonchen@google.com> | Fri Oct 08 13:15:11 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Oct 08 13:15:11 2010 -0700 |
| tree | bfd6c2cf2850727a6095d0abddbd59e18656982f | |
| parent | c3f8f2bef370359d3c433a6e27f41ccef914d6ac [diff] | |
| parent | 1a469ca1cbdf7249b14101b7b0adbe0fe7014979 [diff] |
Merge "Resolved conflicts for merge of 2bd6afed to master"