| commit | 5a93032dcbe54223e03102d497d7e04370491737 | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Mon Jul 12 17:29:16 2010 -0700 |
| committer | Dirk Dougherty <ddougherty@google.com> | Mon Jul 12 17:30:05 2010 -0700 |
| tree | 1f6c06f249defe57c0262dabe88d0f393ffcb2fc | |
| parent | b10080106909fd860ed33ac46de9f2f084e358d6 [diff] | |
| parent | 3c691a8d7f1ff39e274352569d19654ebf6160e7 [diff] |
doc change: resolved conflicts for merge of 3c691a8d to gingerbread Conflicts: docs/html/sdk/android-2.2.jd Change-Id: I58f9503db8692df15dba1277a46e4c6eb338b438