tree 729806e9e36da8362047229d1a96f6f630505459
parent a9f6cc54e7330a03e55291bda1d75bc78f3f8f2a
parent 9dd40e9756de23a25aaa9909c8d4055105621a76
author Colin Cross <ccross@android.com> 1378253615 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378253615 -0700

am 9dd40e97: am d171b656: Merge "[GNSS] Add AID_GPS to property user white list"

* commit '9dd40e9756de23a25aaa9909c8d4055105621a76':
  [GNSS] Add AID_GPS to property user white list