| commit | 8728c6a5485c611f7af72b1ffb6eb6b14821846d | [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 | 45db30090f906e068a520044e7b3bbad9c45da49 | |
| parent | cee6103d08bb4f7d78dfa3496ced876c4c54b9e9 [diff] | |
| parent | 4c655a26896a501ad676e008e197a5e5ca9a5bfd [diff] |
doc change: resolved conflicts for merge of 3c691a8d to gingerbread Conflicts: docs/html/sdk/android-2.2.jd Change-Id: I58f9503db8692df15dba1277a46e4c6eb338b438