| commit | 72f5d5b94993197c6495c9b883bf2c42599d0224 | [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 | 72e708ec7418fce9aaab77501a4cc9be82766f15 | |
| parent | 4576b09a11ae26c8ff78e2c776522ae212d9d1b5 [diff] | |
| parent | fcaaa5a74a354c77d0a1636c178f6f88434bfb80 [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