Dirk Dougherty a947fce312 cherry-pick fda3521ea37b53c1dc633c39845e4e8f25c3234f into froyo ...

Conflicts:

	docs/html/sdk/ndk/1.5_r1/index.jd

Change-Id: I19f6e97bd019ac347a34db0aea157a33d0217189

2010-03-26 16:32:02 -07:00

..

index.jd

…