| commit | b3a5b85a612703e54e631ffab5bb518eba909899 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Mon Oct 04 15:39:24 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 04 15:39:24 2010 -0700 |
| tree | 4d06a96fea1ddcf1fa2d73614f268b6d6a9ad034 | |
| parent | b99f0c7eae365f788a21944fef28de580c7f5f92 [diff] | |
| parent | 6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d [diff] |
am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38 Merge commit '6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d' into gingerbread * commit '6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d': docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38