Merge commit '479a49f74f77855825ba69b105c065422c24246a'
* commit '479a49f74f77855825ba69b105c065422c24246a':
sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.
I haven't touched instances of "behaviour", "dequeue", "removeable",
"resizeable", or "removeable" because all are accepted variant spellings
and I don't know what the policy is on such things.