Brad Fitzpatrick
744b19817d
am f6809853: am 7a84a60d: am 1a5a2379: Merge "Unregister callback from binder when vibration is removed"
...
* commit 'f68098534e42b33cd4588bb2d2ba34ab579e11aa':
Unregister callback from binder when vibration is removed
2011-03-30 16:37:58 -07:00
Mike Lockwood
8200221eee
am 08d5de83: am cd90d1f1: am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
...
* commit '08d5de83393dbd4d31893d96e4871a8a3628a2cd':
UsbService: Make USB disconnect handling for accessory mode more robust
2011-03-30 16:33:40 -07:00
Jeff Hamilton
43dcc6ceab
am 0c691f0e: am ad91eee2: am 9c1ef098: Update the value for the NFC shared UID.
...
* commit '0c691f0eb3bc844e778f9a61e777076658879dfd':
Update the value for the NFC shared UID.
2011-03-30 16:31:27 -07:00
Teng-Hui Zhu
c499fd340a
Merge "Buffering in full screen mode will show progressView"
2011-03-30 16:19:07 -07:00
Mathias Agopian
24a49462b3
Merge "Revert "retire android_native_window_t""
2011-03-30 15:30:39 -07:00
Mathias Agopian
1cd921eab3
Revert "retire android_native_window_t"
...
this type is still used by partner's source trees.
we will get rid of it in next release's timeframe.
This reverts commit 7b49b976277cb3538242151e7dbd24681ddec73e.
2011-03-30 15:28:21 -07:00
Andreas Huber
1bcf580ac7
Merge "Support for divx files, i.e. mpeg 4 video + mpeg audio layer III in .avi files"
2011-03-30 13:48:10 -07:00
Daniel Sandler
1f7ea98c25
Merge "Add missing dimension resource."
2011-03-30 12:56:09 -07:00
Fabrice Di Meglio
eecf977237
Merge "Fix text redering issue where the text was sometimes truncated"
2011-03-30 12:01:52 -07:00
Adam Powell
17d0c3d0b5
Merge "Fix public issue 15862: Theme Theme.Holo.Light.NoActionBar not available for use"
2011-03-30 11:48:58 -07:00
Winson Chung
94bcdfe130
Merge "Deprecating old RemoteViews API which takes appWidgetId when setting the RemoteViewsAdapter intent."
2011-03-30 11:44:08 -07:00
Andreas Huber
6ff4ea30b9
Merge "Stagefright DataSources now expose the underlying content mime type."
2011-03-30 11:26:04 -07:00
Mike Lockwood
7333ff528a
Merge "Remove logging from HardwareService flashlight calls"
2011-03-30 09:24:09 -07:00
Brad Fitzpatrick
cd2b0eefcf
am 7a84a60d: am 1a5a2379: Merge "Unregister callback from binder when vibration is removed"
...
* commit '7a84a60d569ef7373fbb6418026b935d48fcd7e7':
Unregister callback from binder when vibration is removed
2011-03-30 08:20:51 -07:00
Jeff Brown
1ca13de1af
Merge "Support primitive ALT-TAB style navigation using Recent Apps."
2011-03-30 02:33:44 -07:00
Brian Carlstrom
873c8dafbe
Merge "SamplingProfilerIntegration and SamplingProfiler improvements (3/3)"
2011-03-29 22:35:40 -07:00
Mike Lockwood
78dc1a184e
am cd90d1f1: am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
...
* commit 'cd90d1f1173c344738362d24bdc637c355b75645':
UsbService: Make USB disconnect handling for accessory mode more robust
2011-03-29 22:17:36 -07:00
Mike Lockwood
80c12241b1
am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
...
* commit '44e4b99f823a6d6131f94e67389b705d3b124c0a':
UsbService: Make USB disconnect handling for accessory mode more robust
2011-03-29 22:16:17 -07:00
Mike Lockwood
9870439c00
Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
2011-03-29 22:14:27 -07:00
Romain Guy
1aed2e3e0b
Merge "Move the drawable state to the correct class. Bug #4170455 "
2011-03-29 18:33:12 -07:00
Wink Saville
d1790f627a
am 8a395624: am fc151b6e: Merge "Cleanup DataConnectionTracker" into honeycomb-LTE
...
* commit '8a395624042ed06732703c4e272ad416a45ecf10':
Cleanup DataConnectionTracker
2011-03-29 17:00:11 -07:00
Eric Fischer
b6d2b82685
am c9e5464b: (-s ours) am b8c7c66d: am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'c9e5464b06aa6abb8db60094483a0d353515fb67':
Import revised translations. DO NOT MERGE
2011-03-29 16:59:35 -07:00
Eric Fischer
848b96b841
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
2011-03-29 16:59:31 -07:00
Teng-Hui Zhu
c8e2f02ef7
Merge "Add the loading progress UI when buffering"
2011-03-29 16:58:19 -07:00
Amith Yamasani
f04c7cb8cd
am 342f38f9: am c1192096: am 7171f5b7: Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1
...
* commit '342f38f9a95e26b20ebaaac6402409beb9ba96f8':
Fix the javadoc for LocationManager.requestSingleUpdate()
2011-03-29 16:58:16 -07:00
Christopher Tate
cf88963bb2
Merge "Add view/drawable states for drag-accepting / drag-hovered"
2011-03-29 16:49:46 -07:00
Jeff Hamilton
1ad210d328
am ad91eee2: am 9c1ef098: Update the value for the NFC shared UID.
...
* commit 'ad91eee2774e18204a14d473242efe5640b91152':
Update the value for the NFC shared UID.
2011-03-29 16:28:49 -07:00
Dmitry Shmidt
b484ff5edd
Merge "bugreport: Add ping wlan gateway, dns1 and dns2 servers"
2011-03-29 16:28:00 -07:00
Jeff Brown
0ff61b259d
Merge "Support chorded fallback keys."
2011-03-29 16:19:46 -07:00
James Dong
46cd8cac6c
Merge "Fix missing cross-ref links in the MediaPlayer.java javadoc"
2011-03-29 15:17:47 -07:00
Marco Nelissen
b454f1a52a
Merge "Fix media scanner uri handling."
2011-03-29 15:16:55 -07:00
Wink Saville
91b0466585
am fc151b6e: Merge "Cleanup DataConnectionTracker" into honeycomb-LTE
...
* commit 'fc151b6eb4a682510f3591879037b524bc8d59d0':
Cleanup DataConnectionTracker
2011-03-29 15:12:22 -07:00
Wink Saville
2e7c89b84a
Merge "Cleanup DataConnectionTracker" into honeycomb-LTE
2011-03-29 14:44:56 -07:00
Eric Fischer
00743cc67f
am b8c7c66d: am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'b8c7c66de23b9b20f3992722bb5e346d8e12dd0e':
Import revised translations. DO NOT MERGE
2011-03-29 14:19:51 -07:00
Eric Fischer
2ffee604fa
am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '0664a4b18c3dcea82891a7389976a9d62ac7bc61':
Import revised translations. DO NOT MERGE
2011-03-29 14:15:22 -07:00
Amith Yamasani
2bd70ca87e
am c1192096: am 7171f5b7: Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1
...
* commit 'c1192096627f2f9da534cb8ab7b449d6ea82123f':
Fix the javadoc for LocationManager.requestSingleUpdate()
2011-03-29 14:10:32 -07:00
Eric Fischer
270c1a567d
am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'b42e83b1eccfd1fa1e02cd0c30edfc06e05de995':
Import revised translations. DO NOT MERGE
2011-03-29 14:07:14 -07:00
Amith Yamasani
533b7eb13c
am 7171f5b7: Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1
...
* commit '7171f5b7d16e9a0c861cc249188864385877077f':
Fix the javadoc for LocationManager.requestSingleUpdate()
2011-03-29 14:06:29 -07:00
Amith Yamasani
e509e5e805
Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1
2011-03-29 13:55:19 -07:00
Andreas Huber
0621746347
Merge "Add a user-agent header to our RTSP requests."
2011-03-29 13:52:15 -07:00
Eric Fischer
e138d6753f
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-03-29 13:45:03 -07:00
Eino-Ville Talvala
2e2132d773
Merge "Add a simple OpenGL ES 2.0 test program that displays a camera preview stream."
2011-03-29 13:34:03 -07:00
Andreas Huber
343b539281
Merge "Adding support for the '.mxmf' MIDI file extension."
2011-03-29 13:33:58 -07:00
Bart Sears
a129d4434f
am 7cad54cb: (-s ours) am 35137d66: (-s ours) am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
...
* commit '7cad54cb8283b67e5d4106112772dc038b7dbb40':
Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
2011-03-29 13:23:55 -07:00
Huahui Wu
b8f4d6d997
am 97621525: (-s ours) am 772f5bb1: (-s ours) am f440831d: DO NOT MERGE
...
* commit '97621525c54057550dc40b38dcbe03de70cadd87':
DO NOT MERGE
2011-03-29 13:23:52 -07:00
Bart Sears
5116244797
am 35137d66: (-s ours) am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
...
* commit '35137d669681a0d6a22316c035ea7c8edc8fdc33':
Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
2011-03-29 13:19:07 -07:00
Huahui Wu
ec3a0e5ef6
am 772f5bb1: (-s ours) am f440831d: DO NOT MERGE
...
* commit '772f5bb1894710b0f0068d4f34e85ce38becc4b6':
DO NOT MERGE
2011-03-29 13:19:01 -07:00
Eric Fischer
c2cb14c6c0
am 7d5ae753: (-s ours) am bc2489e4: am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit '7d5ae7537858d6b01ae2ce12e34cb0a284138ccf':
Import revised translations. DO NOT MERGE
2011-03-29 12:30:12 -07:00
Eric Fischer
711b114c19
am bc2489e4: am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'bc2489e4c55ca7ae06afe1f3449135aa48359165':
Import revised translations. DO NOT MERGE
2011-03-29 12:27:29 -07:00
Andreas Huber
ccec7a73a4
Merge "Make sure we don't trigger a log warning if calling ALooper::stop() from the looper thread."
2011-03-29 12:23:34 -07:00