tree ad7f80ba765f60d72e36b2813909b680d87d926c
parent 769ed21c33c3629411eb3bbf924de45737a18067
parent 95b528eab5e087868f487340eb83ecddba708653
author Dirk Dougherty <ddougherty@google.com> 1264725656 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1264725656 -0800

Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair