tree 9f1bcf38beb5e4dff1351db237c00a305ad676a4
parent 74a15c0db0445d1df7b82ee46c65e260dd72dee8
parent 71b0594a6fc7339281add91d2ac61b181f89a2af
author Karl Rosaen <> 1241037807 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1241037807 -0700

am 71b0594: Merge branch \'readonly-p4-donut\' into donut

Merge commit '71b0594a6fc7339281add91d2ac61b181f89a2af'

* commit '71b0594a6fc7339281add91d2ac61b181f89a2af':
  AI 147564: Merge back from search branch to donut.  Notes: