tree 99be5cc1bdfd5aebae7c8f785db024a2b0c547f5
parent f6e802283cea8d682d05ee15fe0d500cff118533
parent 1715cb36d9231f08f244ec6c0a373f1a46d66cc7
author Brian Muramatsu <btmura@google.com> 1344563169 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1344563170 -0700

Merge "Control GPS logging with property" into jb-mr1-dev