tree 29e4e92e2970017fb8a20b1645f8974232a3ac73
parent 7a506392361057b9295c9c3c97937560d09ed5dd
parent 50d87fbd691a59759d5bbe12284d322f9fa967dd
author Android (Google) Code Review <android-gerrit@google.com> 1246569933 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1246569933 -0700

am 50d87fbd: Merge change 5879 into donut

Merge commit '50d87fbd691a59759d5bbe12284d322f9fa967dd'

* commit '50d87fbd691a59759d5bbe12284d322f9fa967dd':
  Represent new searchSettingsDescription attribute on searchables in