1f40f174e7
Merge commit 'b574cf876e64d8a9330b052d48dcc64c5abdd70a' * commit 'b574cf876e64d8a9330b052d48dcc64c5abdd70a': SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.