am 2a547829: Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo
Merge commit '2a547829' into froyo-plus-aosp
* commit '2a547829':
cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96