From: Brian Swetland <swetland@google.com>
Date: Wed, 22 Sep 2010 00:44:08 +0000 (-0700)
Subject: am d451b872: (-s ours) am c1a1aa1e: deal with gps renaming
X-Git-Tag: android-x86-4.4-r1~2139
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=58118ccc565db991cd82ae5f4cbd0a5057438dbc;p=android-x86%2Fbuild.git

am d451b872: (-s ours) am c1a1aa1e: deal with gps renaming

Merge commit 'd451b872babde2f97da08ba27d60e18643b76f0a'

* commit 'd451b872babde2f97da08ba27d60e18643b76f0a':
  deal with gps renaming
---

58118ccc565db991cd82ae5f4cbd0a5057438dbc