| commit | 425c305a535d8c5a9082685523ba46d06199e543 | [log] [tgz] |
|---|---|---|
| author | Xia Wang <xiaw@google.com> | Tue Oct 12 11:07:11 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Oct 12 11:07:11 2010 -0700 |
| tree | bd809cbe23d92a02b0213ae5891efaf4de5906cd | |
| parent | d10cd5765a2b706fc174f16b951d6b0a5d3740d3 [diff] | |
| parent | a5496cd28c220d0e55c50647f2fa56a794776f01 [diff] |
Merge "resolved conflicts for merge of d4e3bf4d to master"