| commit | 0f77061f389a9b86b3cc296af7ebd0f18ae1a667 | [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 | 8a2ad642b3eb79903546ed32f689a47927a9a405 | |
| parent | 90c9df0582ceb0929cfb9ceb7dc78dffc9754568 [diff] | |
| parent | 72f5d5b94993197c6495c9b883bf2c42599d0224 [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