| commit | fc7f39196be7e7e741ece79b4b551c52cdb67f0d | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Mon Oct 04 15:49:07 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 04 15:49:07 2010 -0700 |
| tree | 572c4ea6e50f551f4dc1ee4ddeadf8dc69d936c7 | |
| parent | 6a02ba0100e030e0b8bf2b6f195eabac1f1812db [diff] | |
| parent | b3a5b85a612703e54e631ffab5bb518eba909899 [diff] |
am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38 Merge commit 'b3a5b85a612703e54e631ffab5bb518eba909899' into gingerbread-plus-aosp * commit 'b3a5b85a612703e54e631ffab5bb518eba909899': docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38