tree 4383be5445a46f0445eb89d8124a52a0fc233991
parent c292927f05ff6955b1e5ffe40b8b9777328eba55
parent 2f85f654eea8255ee4acd7230e4f72fc2cdaacb5
author Dianne Hackborn <hackbod@google.com> 1285719565 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285719565 -0700

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

Merge commit '2f85f654eea8255ee4acd7230e4f72fc2cdaacb5' into gingerbread-plus-aosp

* commit '2f85f654eea8255ee4acd7230e4f72fc2cdaacb5':
  Add location shared library to core build.