tree c5da43f3039f27b45b0e49baf280585479df51d3
parent ec1b9c508c4d04d68131579c4716ff32a3e29740
parent 3e44f8076a16792bb295589ca4b467ba27ea2a6f
author Owen Lin <owenlin@google.com> 1258595682 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258595682 -0800

am 3e44f807: Use "Use My Location" settings to decide wheather we store the picture\'s location.

Merge commit '3e44f8076a16792bb295589ca4b467ba27ea2a6f' into eclair-mr2

* commit '3e44f8076a16792bb295589ca4b467ba27ea2a6f':
  Use "Use My Location" settings to decide wheather we store the picture's location.