OSDN Git Service
Chia-chi Yeh [Wed, 8 Jun 2011 21:17:44 +0000 (14:17 -0700)]
Merge "The UI part of the user space VPN support."
Chia-chi Yeh [Tue, 24 May 2011 00:26:46 +0000 (17:26 -0700)]
The service part of the user space VPN support.
The dialogs will be in another change.
Change-Id: I0cdfd2ef21ffd40ee955b3cbde5ada65dbfdb0bc
Nick Pelly [Wed, 8 Jun 2011 20:44:28 +0000 (13:44 -0700)]
Merge "Move NDEF URI helper method into android.nfc.NfcRecord"
Chet Haase [Wed, 8 Jun 2011 19:51:06 +0000 (12:51 -0700)]
Merge "Add 'Property' object"
Nick Pelly [Wed, 8 Jun 2011 00:27:44 +0000 (17:27 -0700)]
Move NDEF URI helper method into android.nfc.NfcRecord
Change-Id: Ia044e45cbe2cd06c4844d15a57f1c1f392cf65cd
Martijn Coenen [Wed, 8 Jun 2011 18:04:36 +0000 (11:04 -0700)]
Merge "Implement Felica timeout handling (API)."
Martijn Coenen [Mon, 6 Jun 2011 15:06:54 +0000 (17:06 +0200)]
Implement Felica timeout handling (API).
Allows controlling the timeout for transceive on Felica.
Change-Id: I5c62b3ea0e8a16bc006feac6ec759cdb730bc938
Robert Greenwalt [Wed, 8 Jun 2011 17:29:13 +0000 (10:29 -0700)]
Merge "resolved conflicts for merge of
e139167c to master"
Robert Greenwalt [Wed, 8 Jun 2011 17:01:06 +0000 (10:01 -0700)]
resolved conflicts for merge of
e139167c to master
Change-Id: Ic4d8aae7dd457457d9cc8ba081b273e425729f86
Mike Lockwood [Wed, 8 Jun 2011 16:43:02 +0000 (09:43 -0700)]
Merge "MTP: Remove obsolete setPtpMode support"
Mike Lockwood [Wed, 8 Jun 2011 16:42:54 +0000 (09:42 -0700)]
Merge "UsbManager: Clean up extras for ACTION_USB_STATE broadcast"
Chet Haase [Tue, 24 May 2011 21:36:40 +0000 (14:36 -0700)]
Add 'Property' object
This change adds a generic Property facility to the SDK, which allows an
easy way to reference fields (private or otherwise) in a general way.
For example, animations can use this facility to animate 'properties'
on target objects in a way that is more code- and compiler-friendly than
the existing String-based approach (for objects which have implemented
Properties, of course). The animator classes have been updated to use
this new approach (in addition to Strings, which are still more generally
useful for objects which have get/set functions but not Property objects).
The change also includes new Property objects on View (which can now be
used in creating animations on Views).
There is an unrelated change on GLES20RecordingCanvas to change the way we
cache bitmaps, which avoids spurious garbage by using an ArrayList instead of
a HashSet.
Change-Id: I167b43a3fca20e7695b1a23ca81274367539acda
Mike Lockwood [Wed, 8 Jun 2011 16:19:23 +0000 (09:19 -0700)]
MTP: Remove obsolete setPtpMode support
PTP mode will be implemented as a separate USB function instead.
Change-Id: I9304c1936c70604ab2ed9704c6b95e11b61f5ba2
Signed-off-by: Mike Lockwood <lockwood@android.com>
Eino-Ville Talvala [Wed, 8 Jun 2011 16:18:37 +0000 (09:18 -0700)]
Merge "Updates to Camera API documentation."
Mike Lockwood [Wed, 8 Jun 2011 16:17:45 +0000 (09:17 -0700)]
UsbManager: Clean up extras for ACTION_USB_STATE broadcast
Also added name for new PTP USB function
Change-Id: Ia2775ba2b23ef6a6108ca7e060239eb51c2eecc8
Signed-off-by: Mike Lockwood <lockwood@android.com>
Steve Block [Wed, 8 Jun 2011 15:26:13 +0000 (08:26 -0700)]
Merge "Merge WebKit at r82507: Update useragent string"
Steve Block [Wed, 8 Jun 2011 14:17:10 +0000 (15:17 +0100)]
Merge WebKit at r82507: Update useragent string
Change-Id: Ie24ef844bdaf07a6aee848a04a49d0845b52ee64
satok [Wed, 8 Jun 2011 11:09:21 +0000 (04:09 -0700)]
Merge "Fix the display name of InputMethodSubtype"
satok [Wed, 8 Jun 2011 10:11:14 +0000 (19:11 +0900)]
Fix the display name of InputMethodSubtype
- Also fixed hashCode
Change-Id: I4ef4bf42e4b73d11e23a89c5df3947411e654c04
Narayan Kamath [Wed, 8 Jun 2011 09:11:26 +0000 (02:11 -0700)]
Merge "Fix the threading behaviour of TTS audio requests."
Jeff Sharkey [Sun, 5 Jun 2011 23:05:02 +0000 (16:05 -0700)]
Intent to manage application network data usage.
Will be launched by Settings when presenting detailed network data
usage for a specific application. Offers easy access into application
settings to change behavior.
Change-Id: I4ee0fdbc69f6a800ad59aca8db6b21f15ca71a66
Jeff Sharkey [Fri, 3 Jun 2011 00:38:22 +0000 (17:38 -0700)]
Compute range-based usage in NetworkStatsHistory.
When given a start/end range, interpolate between buckets to return
the total network usage. Used to summarize detailed UID stats. Method
to combine NetworkStatsHistory regardless of bucket size. Used to
combine all histories matching a template.
Added tests for both methods.
Change-Id: Ia463910c0ecf7cf08dcf97c658ad99742bd6b882
Jeff Sharkey [Mon, 30 May 2011 05:50:42 +0000 (22:50 -0700)]
UID network stats, secure settings, and random.
Collect UID-granularity network stats during regular poll event. Add
dumpsys argument to generate fake historical data for debugging, and
move stats parameters to Settings.Secure.
Change-Id: I09b36a2955dc10c697d4b9c3ff23dcb3ac37bd70
Jeff Sharkey [Sun, 29 May 2011 03:56:34 +0000 (20:56 -0700)]
Map network identity using ConnectivityService.
Instead of deriving network identity based on raw subsystem broadcasts,
listen for updates from ConnectivityService. Added atomic view of all
active NetworkState, and build map from "iface" to NetworkIdentity set
for stats tracking.
To avoid exposing internal complexity, INetworkStatsService calls use
general templates. Added TelephonyManager mapping to classify network
types using broad labels like "3G" or "4G", used to drive templates.
Cleaned up Objects and Preconditions.
Change-Id: I1d4c1403f0503bc3635a59bb378841ba42239a91
Svetoslav Ganov [Wed, 8 Jun 2011 02:29:20 +0000 (19:29 -0700)]
Merge "Crash in the TouchExplorer"
Svetoslav Ganov [Wed, 8 Jun 2011 02:24:10 +0000 (19:24 -0700)]
Crash in the TouchExplorer
1. No clearing the last touch explore event in all cases
when transitioning to another mode.
2. Incorrectly assuming the the action index of an up/down
events is 0.
bug:
4551506
Change-Id: I43f8e800b54a340968489dc924a539795a9195cb
Jesse Wilson [Wed, 8 Jun 2011 01:49:32 +0000 (18:49 -0700)]
Merge "Use external/mockwebserver in frameworks/base"
Chia-chi Yeh [Wed, 8 Jun 2011 01:18:56 +0000 (18:18 -0700)]
Merge "Do not register the callbacks in the constructor."
Adam Powell [Wed, 8 Jun 2011 01:16:00 +0000 (18:16 -0700)]
resolved conflicts for merge of
a7d01a75 to master
Change-Id: Ib6a7bbca7711cb5e35085868c4b9b5cbb9b526a4
Wink Saville [Wed, 8 Jun 2011 00:54:25 +0000 (17:54 -0700)]
am
7f13d0ed: am
c368831d: Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE
* commit '
7f13d0ed408c3ddce5b061c4370d99ba15d027b7':
Preferred network discrepancy after rild is restarted.
Robert Greenwalt [Wed, 8 Jun 2011 00:54:17 +0000 (17:54 -0700)]
am
31ced5c1: am
350b7829: Merge "Fix NPE in the statusbar." into honeycomb-LTE
* commit '
31ced5c140cae9b3ad90066a540346acd821a3c9':
Fix NPE in the statusbar.
Jaikumar Ganesh [Wed, 8 Jun 2011 00:53:41 +0000 (17:53 -0700)]
am
6aa152a1: (-s ours) am
c8410017: (-s ours) am
1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread
* commit '
6aa152a1df3f77b5838a62194fc196e04d8a5c6a':
Remove discoverable timeout handler. DO NOT MERGE
Jeff Brown [Wed, 8 Jun 2011 00:52:53 +0000 (17:52 -0700)]
am
e046555b: am
fd324486: am
5cb05eea: Merge "Fix build." into honeycomb-mr2
* commit '
e046555b4d92179327d12d888be967fff5c027ca':
Fix build.
Jeff Brown [Wed, 8 Jun 2011 00:52:30 +0000 (17:52 -0700)]
am
61220e88: am
bbbab26e: am
2c180499: Merge "Revert velocity damping. Bug:
4364920" into honeycomb-mr2
* commit '
61220e880ac4d9d76b7fd50744439e68e929c697':
Revert velocity damping. Bug:
4364920
Jeff Brown [Wed, 8 Jun 2011 00:52:22 +0000 (17:52 -0700)]
am
55cc25c1: am
797dc698: am
b92dcf9c: Merge "Simplify spot tracking logic. Bug:
4124987" into honeycomb-mr2
* commit '
55cc25c12c45e8ffb65d2275cc0b6941b68db9df':
Simplify spot tracking logic. Bug:
4124987
Jeff Brown [Wed, 8 Jun 2011 00:48:39 +0000 (17:48 -0700)]
resolved conflicts for merge of
8b2c0014 to master
Change-Id: I33a5a2949dc6c2d09e8196ba8c7128caa7ac2361
Irfan Sheriff [Wed, 8 Jun 2011 00:19:02 +0000 (17:19 -0700)]
am
5e4d0206: am
b400184a: Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE
* commit '
5e4d0206486378ffc7d2992750e439d54df15147':
Handle AsyncChannel disconnect in WifiService
Jeff Brown [Wed, 8 Jun 2011 00:18:48 +0000 (17:18 -0700)]
am
c3709f25: am
277bfd7c: am
c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2
* commit '
c3709f2509bfc15d13a590b8342503f858ee67e2':
Improve browser scrolling when using the mouse wheel.
Dianne Hackborn [Wed, 8 Jun 2011 00:18:16 +0000 (17:18 -0700)]
am
4bd50588: am
fc3fa5dc: am
1b405592: Merge "Fix issue #
4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2
* commit '
4bd505883df3d8ca7583d854f1c71302c615519d':
Fix issue #
4539687: At least one compatibility-mode app (Androminion)...
Xavier Ducrohet [Wed, 8 Jun 2011 00:17:11 +0000 (17:17 -0700)]
am
abc83871: am
f6e47999: am
2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2
* commit '
abc838716816107754ab0479242d03807ce79fc2':
Import the Layoutlib from hc-mr1.
Brian Carlstrom [Tue, 7 Jun 2011 22:57:29 +0000 (15:57 -0700)]
Merge "Change KeyChain to assume PEM encoded keystore entries"
Frank Sposaro [Tue, 7 Jun 2011 22:57:11 +0000 (15:57 -0700)]
Merge "Fixed typo. "a a" -> "a""
Jesse Wilson [Tue, 7 Jun 2011 15:06:50 +0000 (08:06 -0700)]
Use external/mockwebserver in frameworks/base
Change-Id: Ifb45671e3e7256692c74587984ee5fe1d0eca181
Christopher Tate [Tue, 7 Jun 2011 22:37:08 +0000 (15:37 -0700)]
Merge "Don't ack/nak backup redundantly at exit"
Christopher Tate [Tue, 7 Jun 2011 22:35:45 +0000 (15:35 -0700)]
Don't ack/nak backup redundantly at exit
Change-Id: I7293518bc2fe6c66270a7c8aea3bf0c0829754e4
Brian Carlstrom [Tue, 7 Jun 2011 20:45:33 +0000 (13:45 -0700)]
Change KeyChain to assume PEM encoded keystore entries
Summary:
- Changed KeyChain to assume PEM encoded keystore entries
- Moved convertToPem from CertInstaller for reuse with other Credentials helpers
- Added convertFromPem for use decoding keystore entries
Change-Id: I340168b88aefa458d01e81324824e2e08b1d7c4e
Christopher Tate [Tue, 7 Jun 2011 22:20:34 +0000 (15:20 -0700)]
Merge "Fix embedded spaces in tar stream EVEN HARDER"
Irfan Sheriff [Tue, 7 Jun 2011 22:16:00 +0000 (15:16 -0700)]
Merge "Update walled garden detection logic"
Irfan Sheriff [Mon, 6 Jun 2011 04:29:56 +0000 (21:29 -0700)]
Update walled garden detection logic
DNS based techniques dont always work. Some hotspots
redirect on data fetch on IP. Use a known pattern match
on URL to detect a walled garden instead.
Also, added gservices capability to turn off the feature
or change the URL & the pattern to match
Bug:
4378442
Change-Id: I78b4208d3ea3ace20069169e7c01ed769892d94d
Amith Yamasani [Tue, 7 Jun 2011 21:48:50 +0000 (14:48 -0700)]
Merge "Volume Panel sizing for phones."
Fabrice Di Meglio [Tue, 7 Jun 2011 01:23:10 +0000 (18:23 -0700)]
Rename atribute View horizontalDirection to layoutDirection and update unit tests
- update before/after to start/end in unit test app
Change-Id: Id7286ef5d9390540faf8ecd5f0b1c140d04bb364
Yu Shan Emily Lau [Tue, 7 Jun 2011 20:40:04 +0000 (13:40 -0700)]
Merge "Cleaned up the old test cases and test media files."
Daniel Sandler [Tue, 7 Jun 2011 20:37:08 +0000 (13:37 -0700)]
Merge "Experimental compatibility mode UI."
Christopher Tate [Tue, 7 Jun 2011 20:17:17 +0000 (13:17 -0700)]
Fix embedded spaces in tar stream EVEN HARDER
Change-Id: I97ac586ff3541a05d73e1e53f680517c15e6c662
Robert Greenwalt [Tue, 7 Jun 2011 20:12:29 +0000 (13:12 -0700)]
am
5df69fad: resolved conflicts for merge of
8de47a2f to honeycomb-LTE
* commit '
5df69fad6e5021d2862bff0553a510f8d6729fbd':
Reveal some network constants.
Robert Greenwalt [Tue, 7 Jun 2011 19:45:41 +0000 (12:45 -0700)]
resolved conflicts for merge of
8de47a2f to honeycomb-LTE
Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749
Mike Lockwood [Tue, 7 Jun 2011 19:44:52 +0000 (12:44 -0700)]
Merge "StorageVolume: Add allowMassStorage flag"
Mike Lockwood [Tue, 7 Jun 2011 15:03:33 +0000 (08:03 -0700)]
StorageVolume: Add allowMassStorage flag
Change-Id: I9d19e635bb06e50068d7e4e6919322bd5bb2e00f
Signed-off-by: Mike Lockwood <lockwood@android.com>
Daniel Sandler [Tue, 7 Jun 2011 19:29:07 +0000 (15:29 -0400)]
Experimental compatibility mode UI.
♫ Just another button, for you and me, in the status bar. ♫
Change-Id: I11ecac63341d4c421dbaffba931861605ebad286
Christopher Tate [Tue, 7 Jun 2011 19:25:06 +0000 (12:25 -0700)]
Merge "Implement shared-storage full backup/restore"
Alon Albert [Tue, 7 Jun 2011 19:16:28 +0000 (12:16 -0700)]
Merge "Add columns: Events.lastSynced: flag marking this as a duplicate of the lastSynced sate of the event Events.sync_data7: General purpose sync column (will be used for editUrl in Google Sync Adapter) Calendars.canPartiallyUpdate: Flag indicating sync adapter can perform partial updates."
Christopher Tate [Thu, 2 Jun 2011 22:08:13 +0000 (15:08 -0700)]
Implement shared-storage full backup/restore
Every available shared-storage volume is backed up, tagged with its
ordinal in the set of mounted shared volumes. This is an approximation
of "internal + the external card". This lets us restore things to the
same volume [or "equivalent" volume, in the case of a cross-model
restore] as they originated on.
Also fixed a bug in the handling of files/dirs with spaces in
their names.
Change-Id: I380019da8d0bb5b3699bd7c11eeff621a88e78c3
Yu Shan Emily Lau [Tue, 7 Jun 2011 19:03:40 +0000 (12:03 -0700)]
Cleaned up the old test cases and test media files.
Change-Id: Icc3c04c69b11b2bb91588a8bb916baf69594e8d3
Robert Greenwalt [Tue, 7 Jun 2011 19:00:37 +0000 (12:00 -0700)]
Merge "Reveal some network constants." into honeycomb-mr2
Iliyan Malchev [Tue, 7 Jun 2011 00:21:32 +0000 (17:21 -0700)]
frameworks/base: updates for camera HAL memory management
-- when the camera HAL allocates memory
-- it requests is as N buffers by S bytes each
-- it may specify a file descriptor to get mmapped; if -1, then we use ashmem
-- when issuing data and data-timestamp callbacks, the camera HAL specifies a
buffer index
-- range checking is performed on the buffer indices
-- memory requested by a camera HAL is not incStrong'ed, and needs to be
expliciftly released by the camera HAL (by calling the release method on the
camera_memory_t handle)
Change-Id: I0f09603aa786c238590e7288388ab673787e6032
Signed-off-by: Iliyan Malchev <malchev@google.com>
Adam Powell [Tue, 7 Jun 2011 18:36:32 +0000 (11:36 -0700)]
am
212d15c7: am
a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
* commit '
212d15c746f2611339026c16e5fa1aeb7f9090b7':
Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
Adam Powell [Tue, 7 Jun 2011 18:32:23 +0000 (11:32 -0700)]
am
a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
* commit '
a476813dccec241632810c1cbb11bcfbf17841b0':
Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
Mike Lockwood [Tue, 7 Jun 2011 18:25:27 +0000 (11:25 -0700)]
Merge "Add comment for deprecation of Intent.ACTION_UMS_CONNECTED and ACTION_UMS_DISCONNECTED"
Mike Lockwood [Tue, 7 Jun 2011 18:23:44 +0000 (11:23 -0700)]
Add comment for deprecation of Intent.ACTION_UMS_CONNECTED and ACTION_UMS_DISCONNECTED
Change-Id: I3c42393c79424217d6b44cccef9de9e06da58193
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mathias Agopian [Tue, 7 Jun 2011 18:15:01 +0000 (11:15 -0700)]
am
cf3036eb: (-s ours) am
c1cbf452: am
24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
* commit '
cf3036ebef2929f84bc4e34ed1e9d96eefd6a5e7':
merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
Wink Saville [Tue, 7 Jun 2011 18:03:25 +0000 (11:03 -0700)]
am
c368831d: Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE
* commit '
c368831d62ce68d6c9c83d7e49e5db11c47ebd85':
Preferred network discrepancy after rild is restarted.
Mike Lockwood [Tue, 7 Jun 2011 18:02:58 +0000 (11:02 -0700)]
Merge "Deprecate Intent.ACTION_UMS_CONNECTED and Intent.ACTION_UMS_DISCONNECTED"
Alon Albert [Mon, 6 Jun 2011 21:04:00 +0000 (14:04 -0700)]
Add columns:
Events.lastSynced: flag marking this as a duplicate of the lastSynced sate of the event
Events.sync_data7: General purpose sync column (will be used for editUrl in Google Sync Adapter)
Calendars.canPartiallyUpdate: Flag indicating sync adapter can perform partial updates.
Change-Id: I5c153fb9cbf43dd1def0267c2f912a59038b28c1
Robert Greenwalt [Tue, 7 Jun 2011 18:01:23 +0000 (11:01 -0700)]
am
350b7829: Merge "Fix NPE in the statusbar." into honeycomb-LTE
* commit '
350b78291de725a1607395055b6d28655d9e1080':
Fix NPE in the statusbar.
Mike Lockwood [Tue, 7 Jun 2011 16:08:34 +0000 (09:08 -0700)]
Deprecate Intent.ACTION_UMS_CONNECTED and Intent.ACTION_UMS_DISCONNECTED
Change-Id: I7261959462422cf241a46a5ada6fbd98d655db3d
Signed-off-by: Mike Lockwood <lockwood@android.com>
Wink Saville [Tue, 7 Jun 2011 17:58:09 +0000 (10:58 -0700)]
Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE
Robert Greenwalt [Tue, 7 Jun 2011 17:57:20 +0000 (10:57 -0700)]
Merge "Fix NPE in the statusbar." into honeycomb-LTE
Wink Saville [Tue, 7 Jun 2011 17:44:43 +0000 (10:44 -0700)]
Preferred network discrepancy after rild is restarted.
If the preferred network had updated before rild restarts,
the new setting value is ignored on RIL_CONNECT event.
bug: IKXEVERESTLTE-1494
Change-Id: Iec6395187c0d749208904db857b80e28f7d92c21
Eino-Ville Talvala [Tue, 7 Jun 2011 17:34:56 +0000 (10:34 -0700)]
Updates to Camera API documentation.
Change-Id: I716a36becce436f57ea62fcfecd9021eb29b76ea
Adam Powell [Fri, 3 Jun 2011 00:40:51 +0000 (17:40 -0700)]
Make Theme.Holo.Light.NoActionBar and
Theme.Holo.Light.NoActionBar.Fullscreen public.
Change-Id: I623b5908b080e8703b825707a024fa922cd954ab
Jaikumar Ganesh [Tue, 7 Jun 2011 17:01:28 +0000 (10:01 -0700)]
am
c8410017: (-s ours) am
1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread
* commit '
c8410017502dacff43ecd3e0926049b99fc186a8':
Remove discoverable timeout handler. DO NOT MERGE
Narayan Kamath [Fri, 3 Jun 2011 17:11:54 +0000 (18:11 +0100)]
Fix the threading behaviour of TTS audio requests.
All audio is played back on a separate thread.
Change-Id: I2bbb7b3140f6a04ef705cadb2bd1ae88951e3c48
Wu-cheng Li [Tue, 7 Jun 2011 11:05:35 +0000 (04:05 -0700)]
Merge "Improve android.hardware.Camera.Area javadoc."
Wu-cheng Li [Tue, 7 Jun 2011 10:23:14 +0000 (18:23 +0800)]
Improve android.hardware.Camera.Area javadoc.
bug:
4553469
Change-Id: Iae88af354fee4925cb7978572c27f6dd5595ca59
Xia Wang [Tue, 7 Jun 2011 05:00:31 +0000 (22:00 -0700)]
Merge "Add OpenGl benchmark tests: display images with different texture in each mesh."
Jeff Brown [Tue, 7 Jun 2011 04:11:44 +0000 (21:11 -0700)]
am
fd324486: am
5cb05eea: Merge "Fix build." into honeycomb-mr2
* commit '
fd3244868dec40707039cd616dd37ada41774547':
Fix build.
Jeff Brown [Tue, 7 Jun 2011 04:08:25 +0000 (21:08 -0700)]
am
5cb05eea: Merge "Fix build." into honeycomb-mr2
* commit '
5cb05eea289559b30cf4f84130cb6afba0921638':
Fix build.
Jeff Brown [Tue, 7 Jun 2011 04:06:30 +0000 (21:06 -0700)]
Merge "Fix build." into honeycomb-mr2
Jeff Brown [Tue, 7 Jun 2011 04:04:14 +0000 (21:04 -0700)]
Fix build.
Change-Id: I9ea07637058e2aa74d20d881bc21fea305cc869e
Jeff Brown [Tue, 7 Jun 2011 03:36:49 +0000 (20:36 -0700)]
am
bbbab26e: am
2c180499: Merge "Revert velocity damping. Bug:
4364920" into honeycomb-mr2
* commit '
bbbab26ebe9bc789ba9abac757895a6c31de7cc5':
Revert velocity damping. Bug:
4364920
Jeff Brown [Tue, 7 Jun 2011 03:36:41 +0000 (20:36 -0700)]
am
797dc698: am
b92dcf9c: Merge "Simplify spot tracking logic. Bug:
4124987" into honeycomb-mr2
* commit '
797dc698e9ff85c1a09874cc3f7bfe825b2ff0e1':
Simplify spot tracking logic. Bug:
4124987
Jeff Brown [Tue, 7 Jun 2011 03:34:38 +0000 (20:34 -0700)]
am
b3536145: am
ed48fa89: Merge "Touch pad improvements. Bug:
4124987" into honeycomb-mr2
* commit '
b3536145725250401d25ffa00cda85d222dfc21e':
Touch pad improvements. Bug:
4124987
Irfan Sheriff [Tue, 7 Jun 2011 03:34:35 +0000 (20:34 -0700)]
am
b400184a: Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE
* commit '
b400184ad6277676048a30b042ed0667de662ad8':
Handle AsyncChannel disconnect in WifiService
Jeff Brown [Tue, 7 Jun 2011 03:34:35 +0000 (20:34 -0700)]
am
2c180499: Merge "Revert velocity damping. Bug:
4364920" into honeycomb-mr2
* commit '
2c1804998b6a3f1f9f5f301ccf813363825ab4cf':
Revert velocity damping. Bug:
4364920
Jeff Brown [Tue, 7 Jun 2011 03:34:33 +0000 (20:34 -0700)]
am
b92dcf9c: Merge "Simplify spot tracking logic. Bug:
4124987" into honeycomb-mr2
* commit '
b92dcf9c062064dcca9298b089d95a3ce1ba2e75':
Simplify spot tracking logic. Bug:
4124987
Jeff Brown [Tue, 7 Jun 2011 03:32:25 +0000 (20:32 -0700)]
am
ed48fa89: Merge "Touch pad improvements. Bug:
4124987" into honeycomb-mr2
* commit '
ed48fa89a8e31b04681347a9235c2a566e7dbb8e':
Touch pad improvements. Bug:
4124987
Jeff Brown [Tue, 7 Jun 2011 03:32:18 +0000 (20:32 -0700)]
Merge "Revert velocity damping. Bug:
4364920" into honeycomb-mr2
Jeff Brown [Tue, 7 Jun 2011 03:32:02 +0000 (20:32 -0700)]
am
277bfd7c: am
c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2
* commit '
277bfd7cdd889e4f59e57925b90d1899f7312c4e':
Improve browser scrolling when using the mouse wheel.
Irfan Sheriff [Tue, 7 Jun 2011 03:31:55 +0000 (20:31 -0700)]
Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE
Jeff Brown [Tue, 7 Jun 2011 03:31:55 +0000 (20:31 -0700)]
Merge "Simplify spot tracking logic. Bug:
4124987" into honeycomb-mr2