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

Change-Id: I57ffbfae97d937b9d037d2c3964c4f7a133bf95f
tree: 72b5e02633c3fc4f70c4c682dc85a033fbf4a571
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags