diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-01-28 16:46:54 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-28 16:46:54 -0800 |
| commit | b574cf876e64d8a9330b052d48dcc64c5abdd70a (patch) | |
| tree | db68f5c4cef77f5b86a9c3b5f2d7cba06ec83fe0 /libs/rs/rsg_ScriptJavaClass.cpp | |
| parent | bb074ef9c27711be9148ed6b9decf8e6feb9267b (diff) | |
| parent | 7b00a8ae71c5964cb96e1663b778658eaa069b3e (diff) | |
am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair
Merge commit '7b00a8ae71c5964cb96e1663b778658eaa069b3e' into eclair-plus-aosp
* commit '7b00a8ae71c5964cb96e1663b778658eaa069b3e':
SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
Diffstat (limited to 'libs/rs/rsg_ScriptJavaClass.cpp')
0 files changed, 0 insertions, 0 deletions