tree 06b5d18377bd4a36900debbad78f239e618d6e07
parent d46905b787ca77d10ab4e8cc309683651e69146e
parent 3367df348cb8b3bd6f6ff834d5cbfebfaf20e444
author Dianne Hackborn <hackbod@google.com> 1285720809 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285720809 -0700

am 3367df34: am 2f85f654: Merge "Add location shared library to core build." into gingerbread

Merge commit '3367df348cb8b3bd6f6ff834d5cbfebfaf20e444'

* commit '3367df348cb8b3bd6f6ff834d5cbfebfaf20e444':
  Add location shared library to core build.