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

Merge commit '71b0594a6fc7339281add91d2ac61b181f89a2af'

* commit '71b0594a6fc7339281add91d2ac61b181f89a2af':
  AI 147564: Merge back from search branch to donut.  Notes:
tree: 9f1bcf38beb5e4dff1351db237c00a305ad676a4
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE