Merge commit 'f5a5f04550fb0d7399b8bfbb4976e0ec3b718dd8' into eclair-plus-aosp * commit 'f5a5f04550fb0d7399b8bfbb4976e0ec3b718dd8': Add new Gservices setting for discarding uphill ops for eclair and future devices.
Merge commit 'f5a5f04550fb0d7399b8bfbb4976e0ec3b718dd8' into eclair-plus-aosp * commit 'f5a5f04550fb0d7399b8bfbb4976e0ec3b718dd8': Add new Gservices setting for discarding uphill ops for eclair and future devices.