tree e9f7445deb5dacbfcd31afbf70c738060548db86
parent 6077e189e2d16a8f3cba88d0fd0c415ec5d1cd9f
parent 9c418157014d26e2dfd8a002e35a0e9a62db3caa
author Michael Kwan <mkwan@google.com> 1423614911 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423614911 +0000

am 9c418157: Fixed issue where location from network feature was not properly ignored.

* commit '9c418157014d26e2dfd8a002e35a0e9a62db3caa':
  Fixed issue where location from network feature was not properly ignored.