tree fc4ace607cf39b7b511f43a1781761ea2a8dac15
parent 65363830c1e5ca8c59b6e12b4b43a3f03688ca2e
parent f763e8f42df8e99b84420c80eaff24b3573ff0bc
author Android (Google) Code Review <android-gerrit@google.com> 1246412652 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1246412652 -0700

Merge change 5878 into donut

* changes:
  Add new attribute 'searchSettingsDescription' for use within an app's searchable.xml. This attribute defines the string to be shown as the description a searchable in the 'searchable items' section of system search settings.