tree 4498d724f1d33834ea0df6bf4582c6c69cc2c9d1
parent d09f4aaba224bf2a94e75906a5b6bc27c2ab9ad7
parent b574cf876e64d8a9330b052d48dcc64c5abdd70a
author Dirk Dougherty <ddougherty@google.com> 1264726363 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1264726363 -0800

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

Merge commit 'b574cf876e64d8a9330b052d48dcc64c5abdd70a'

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