From: Rohit Mungee Date: Wed, 25 Aug 2010 06:15:23 +0000 (-0700) Subject: am cdc1d6f4: (-s ours) am cb92616f: Merge "Add support for multiple html directories... X-Git-Tag: android-x86-4.4-r1~2240 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7af5f0d21079ad70f221dbf7cf813f9185088700;p=android-x86%2Fbuild.git am cdc1d6f4: (-s ours) am cb92616f: Merge "Add support for multiple html directories to droiddoc." into gingerbread Merge commit 'cdc1d6f45711bdfa5b71513c6d4e63cf5804bc56' * commit 'cdc1d6f45711bdfa5b71513c6d4e63cf5804bc56': Add support for multiple html directories to droiddoc. --- 7af5f0d21079ad70f221dbf7cf813f9185088700