Merge commit '24780ea60fab2c7fb399c88cd51151eccbbf383f' into eclair-plus-aosp
* commit '24780ea60fab2c7fb399c88cd51151eccbbf383f':
doc change: Move commit 4075b4ced from guide/appendix/faq to resources/faq.
Merge commit '24780ea60fab2c7fb399c88cd51151eccbbf383f' into eclair-plus-aosp
* commit '24780ea60fab2c7fb399c88cd51151eccbbf383f':
doc change: Move commit 4075b4ced from guide/appendix/faq to resources/faq.