3c691a8d
Conflicts: docs/html/sdk/android-2.2.jd Change-Id: I58f9503db8692df15dba1277a46e4c6eb338b438