tree e35dec928128e5d3cccc02a702669dc8fbcd1d05
parent b4c20fca102a2ec6acf1648f2fd16d54fdc07f56
parent dbc7e27ef10349f11ac940d59ff4f812319fce51
author Scott Main <smain@google.com> 1258137932 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258137932 -0800

am dbc7e27e: docs: document the \'showSearchIconAsBadge" flag and "icon" attribute as deprecated. bug 2105329

Merge commit 'dbc7e27ef10349f11ac940d59ff4f812319fce51' into eclair

* commit 'dbc7e27ef10349f11ac940d59ff4f812319fce51':
  docs: document the 'showSearchIconAsBadge" flag and