tree 98c2aa54138fd908e08466ccfb8567ddb09e10bf
parent e1caf2384bc5112a76125034af70319c291ebea8
parent 254117d2f6291578b31d4dd6e60d7c0a999e683e
author Dianne Hackborn <hackbod@google.com> 1285719391 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285719391 -0700

am 4f67e1cc: Merge "Add location shared library for location provider APIs." into gingerbread

Merge commit '4f67e1ccf1ae1a855521a307a13a728b8069838f' into gingerbread-plus-aosp

* commit '4f67e1ccf1ae1a855521a307a13a728b8069838f':
  Add location shared library for location provider APIs.