Merge "packages/providers/PartnerBookmarksProvider: Set LOCAL_SDK_VERSION where possible." am: 6a41008120
am: e2183c2f7e

Change-Id: I905adcdce4725aa352660e02fd7c501b16901ded
tree: ae84ddc9e51649f1021fb64e671c73db32b5fc19
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml