Mike Lockwood
be30126455
am 823f5bf3: Merge "MTP: Use SharedPreferences for MTP device properties rather than sqlite3" into honeycomb-mr1
...
* commit '823f5bf3db8b2f588ae917aaff5d27a65c87f132':
MTP: Use SharedPreferences for MTP device properties rather than sqlite3
2011-03-07 20:06:37 -08:00
Mike Lockwood
da921a5e79
Merge "MTP: Use SharedPreferences for MTP device properties rather than sqlite3" into honeycomb-mr1
2011-03-07 20:04:23 -08:00
Santosh Madhava
dbb597d08b
am 0e8dc72d: Merge "Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents" into honeycomb-mr1
...
* commit '0e8dc72db34c0a4eb92763de4e048abc4d20f47f':
Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents
2011-03-07 19:45:25 -08:00
Santosh Madhava
7b283bee52
Merge "Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents" into honeycomb-mr1
2011-03-07 19:42:16 -08:00
Wink Saville
e0db1feae0
am ff23352e: am b3c991b0: Provide default value for operator numeric for CDMA.
...
* commit 'ff23352ea70339c4230d628ab294fbf52159da06':
Provide default value for operator numeric for CDMA.
2011-03-07 18:54:19 -08:00
Wink Saville
3102b5ed0c
am b3c991b0: Provide default value for operator numeric for CDMA.
...
* commit 'b3c991b0190faa4fc833a5fc9074939fd5d8a3c4':
Provide default value for operator numeric for CDMA.
2011-03-07 18:51:57 -08:00
Dianne Hackborn
80b7b4b46b
am 37e792d5: Merge "Fix issue #3515088 : Don\'t be so aggressive trying to reclaim memory" into honeycomb-mr1
...
* commit '37e792d53d4b38d1283960d62edcd63ef0a30e5e':
Fix issue #3515088 : Don't be so aggressive trying to reclaim memory
2011-03-07 18:21:55 -08:00
Dianne Hackborn
4672f4b772
Merge "Fix issue #3515088 : Don't be so aggressive trying to reclaim memory" into honeycomb-mr1
2011-03-07 18:20:23 -08:00
Chet Haase
bcca40b327
am 4bd6ccd2: Merge "Restore save/restore calls removed recently" into honeycomb-mr1
...
* commit '4bd6ccd25162a7634a90cfde72dcdc7d581d9a88':
Restore save/restore calls removed recently
2011-03-07 18:15:34 -08:00
Romain Guy
14ed074dfe
am 25b81110: Merge "Fix EGL JNI bugs Bug #3461349 " into honeycomb-mr1
...
* commit '25b81110b1a4d8882727ebdb8aef523f108b53fd':
Fix EGL JNI bugs Bug #3461349
2011-03-07 18:13:27 -08:00
Chet Haase
d635f04669
Merge "Restore save/restore calls removed recently" into honeycomb-mr1
2011-03-07 18:12:34 -08:00
Romain Guy
5d4d8bed34
Merge "Fix EGL JNI bugs Bug #3461349 " into honeycomb-mr1
2011-03-07 18:11:21 -08:00
Adam Powell
5e3f918be7
am ad542efb: Merge "Fix bug 3506292 - Add guards against bad event streams to ScaleGestureDetector" into honeycomb-mr1
...
* commit 'ad542efb8aa241d3e576d9567f5b0979355037b3':
Fix bug 3506292 - Add guards against bad event streams to ScaleGestureDetector
2011-03-07 18:10:13 -08:00
Adam Powell
dc0ad7c01e
Merge "Fix bug 3506292 - Add guards against bad event streams to ScaleGestureDetector" into honeycomb-mr1
2011-03-07 18:08:11 -08:00
Adam Powell
08d0a42e4f
am a46c1df2: Merge "Fix bug 4021346 - crash while navigating" into honeycomb-mr1
...
* commit 'a46c1df226f2aea54d3bb068b0537c9b1d28590c':
Fix bug 4021346 - crash while navigating
2011-03-07 16:27:36 -08:00
Adam Powell
5487a1eeef
Merge "Fix bug 4021346 - crash while navigating" into honeycomb-mr1
2011-03-07 16:25:20 -08:00
Chia-chi Yeh
110603b2c2
am ab7c3245: Merge "NEW_API: Unhide RTP APIs." into honeycomb-mr1
...
* commit 'ab7c3245ed7a725406a58826382471105c725468':
NEW_API: Unhide RTP APIs.
2011-03-07 15:41:50 -08:00
Chia-chi Yeh
8b5a2265fe
Merge "NEW_API: Unhide RTP APIs." into honeycomb-mr1
2011-03-07 15:39:54 -08:00
Adam Powell
bdc2be5440
am 43a81197: Merge "Fix bug 3501766 - Make the action bar "up" visual more prominent" into honeycomb-mr1
...
* commit '43a811979d55587e014134f6050dc90ca918f9ce':
Fix bug 3501766 - Make the action bar "up" visual more prominent
2011-03-07 15:09:28 -08:00
Adam Powell
6ac14a6ed9
Merge "Fix bug 3501766 - Make the action bar "up" visual more prominent" into honeycomb-mr1
2011-03-07 15:06:02 -08:00
James Dong
0c8b091141
am 4ed072f9: Merge "Add missing copyright headers to a couple of files" into honeycomb-mr1
...
* commit '4ed072f904b5344ce4ef6f832c618a1d3f43867d':
Add missing copyright headers to a couple of files
2011-03-07 14:44:02 -08:00
James Dong
ae1699dbf7
Merge "Add missing copyright headers to a couple of files" into honeycomb-mr1
2011-03-07 14:41:50 -08:00
Leon Scroggins
a2b419de24
am 6478e4f0: Merge "New button assets for webview. DO NOT MERGE" into honeycomb-mr1
...
* commit '6478e4f0b0a6d34251ca0125eb6067f038e344aa':
New button assets for webview. DO NOT MERGE
2011-03-07 13:49:52 -08:00
Leon Scroggins
47c8659af9
Merge "New button assets for webview. DO NOT MERGE" into honeycomb-mr1
2011-03-07 13:47:30 -08:00
Gloria Wang
273ebe4d4a
am d686c31b: Merge "To support uri started with http:// in some Java APIs Fix for bug 4016388." into honeycomb-mr1
...
* commit 'd686c31bf3da56378e174265889db9bca8e636a3':
To support uri started with http:// in some Java APIs Fix for bug 4016388.
2011-03-07 13:32:27 -08:00
Mike Lockwood
324e53d347
am 11cb5cb9: Merge "MtpClient: Fix problem with getDeviceList() returning empty result in some cases" into honeycomb-mr1
...
* commit '11cb5cb9e322bb06c5006225e8c8ef3f7291ee96':
MtpClient: Fix problem with getDeviceList() returning empty result in some cases
2011-03-07 13:29:39 -08:00
Gloria Wang
276ed6b932
Merge "To support uri started with http:// in some Java APIs Fix for bug 4016388." into honeycomb-mr1
2011-03-07 13:28:27 -08:00
Mike Lockwood
f069e16f65
Merge "MtpClient: Fix problem with getDeviceList() returning empty result in some cases" into honeycomb-mr1
2011-03-07 13:23:40 -08:00
Eric Fischer
7eb0016962
am c5f7f582: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'c5f7f582a6b7632c34270a9d1edb04bc4b7e2640':
Import revised translations. DO NOT MERGE
2011-03-07 13:07:58 -08:00
Eric Fischer
3ac00ae144
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-07 13:03:44 -08:00
Vasu Nori
e530350db4
am 0f73fe1c: Merge "bug:3513950 Rename "completedDownload" to "addCompletedDownload"" into honeycomb-mr1
...
* commit '0f73fe1c847f260d52675ffc1ef54b6daf136772':
bug:3513950 Rename "completedDownload" to "addCompletedDownload"
2011-03-07 12:51:50 -08:00
Vasu Nori
afef62258c
Merge "bug:3513950 Rename "completedDownload" to "addCompletedDownload"" into honeycomb-mr1
2011-03-07 12:46:59 -08:00
Patrick Dubroy
281de2f65d
am 19960989: Merge "Remove guard preventing onDetachedFromWindow() from being called" into honeycomb-mr1
...
* commit '19960989e2c5ad60e4d05ebb3b31bc25ecd751af':
Remove guard preventing onDetachedFromWindow() from being called
2011-03-07 11:54:22 -08:00
Patrick Dubroy
96e84c47a8
Merge "Remove guard preventing onDetachedFromWindow() from being called" into honeycomb-mr1
2011-03-07 11:51:50 -08:00
Jeff Brown
a9b2898ebf
am f0210c36: Merge "Joystick tweaks. (DO NOT MERGE)" into honeycomb-mr1
...
* commit 'f0210c36218c03dc30e444ef85690dc815097920':
Joystick tweaks. (DO NOT MERGE)
2011-03-07 11:49:52 -08:00
Jeff Brown
51a4a2fef8
Merge "Joystick tweaks. (DO NOT MERGE)" into honeycomb-mr1
2011-03-07 11:47:58 -08:00
Romain Guy
3919d9577c
am 0aaa11ed: Merge "Remove many unnecessary save/restore calls." into honeycomb-mr1
...
* commit '0aaa11ed5be45170fb2535a6ce021c92b18d8878':
Remove many unnecessary save/restore calls.
2011-03-07 11:25:41 -08:00
Romain Guy
a7e4eecb9e
Merge "Remove many unnecessary save/restore calls." into honeycomb-mr1
2011-03-07 11:24:02 -08:00
Soojung Shin
82009fc2a8
am fa680a18: am ff5a0990: Added to check for supporting mms content-disposition, utf8 decoding.
...
* commit 'fa680a18f617de202912b8a9fe3fc0890a9fe09e':
Added to check for supporting mms content-disposition, utf8 decoding.
2011-03-07 11:10:28 -08:00
Daniel Sandler
1c1a1a73e0
am ec1f1f4c: Merge changes I674abfcc,Ia40f4c53 into honeycomb-mr1
...
* commit 'ec1f1f4cfc6e253cee4320fe33a385d2218a9bb2':
When the user touches a peeked notification, reset the fadeout timer.
Fix touches on glowing region around panel.
2011-03-07 10:50:54 -08:00
Daniel Sandler
9bcade1d19
Merge changes I674abfcc,Ia40f4c53 into honeycomb-mr1
...
* changes:
When the user touches a peeked notification, reset the fadeout timer.
Fix touches on glowing region around panel.
2011-03-07 10:47:13 -08:00
Winson Chung
eb40916cba
am d452dbc2: Merge "Fixing issue where AppWidget service was being hit regardless of caching in RemoteViewsAdapter. (3467340)" into honeycomb-mr1
...
* commit 'd452dbc2b62a9ddf7558965404f69f9a5e4ad1f5':
Fixing issue where AppWidget service was being hit regardless of caching in RemoteViewsAdapter. (3467340)
2011-03-07 10:24:42 -08:00
Adam Powell
6e83af3dc1
am 9ab91b84: Merge "Fix bug 3509417 - Serialize touch event handling in webview" into honeycomb-mr1
...
* commit '9ab91b843a82ccc853b78cc3c0f21c86e668418e':
Fix bug 3509417 - Serialize touch event handling in webview
2011-03-07 10:22:24 -08:00
Winson Chung
dddae61af5
Merge "Fixing issue where AppWidget service was being hit regardless of caching in RemoteViewsAdapter. (3467340)" into honeycomb-mr1
2011-03-07 10:21:11 -08:00
Adam Powell
411f3c817f
Merge "Fix bug 3509417 - Serialize touch event handling in webview" into honeycomb-mr1
2011-03-07 10:20:23 -08:00
Justin Ho
1783097b72
am ef560044: Merge "SearchView textfield backgrounds for bracketing the submit/voice button and improve padding." into honeycomb-mr1
...
* commit 'ef56004420cd9f1cb84f22e20d649ba8f1791dea':
SearchView textfield backgrounds for bracketing the submit/voice button and improve padding.
2011-03-07 07:32:04 -08:00
Justin Ho
1c1afcf63a
Merge "SearchView textfield backgrounds for bracketing the submit/voice button and improve padding." into honeycomb-mr1
2011-03-07 07:30:09 -08:00
Kristian Monsen
a68a3411d6
am 9f5f7af6: Deprecating webkit API\'s that might not be supported in the future do not merge
...
* commit '9f5f7af6ccaf14303c109bfd5b2605eac16c46c6':
Deprecating webkit API's that might not be supported in the future do not merge
2011-03-07 05:10:12 -08:00
Xia Wang
67e0b2afe9
am 7d83f602: am 928ec5e0: Merge "Modify connectivity manager test suite so that it can be run on Wi-Fi only device." into honeycomb
...
* commit '7d83f6020c31c21b84114b35e6303895d082e18d':
Modify connectivity manager test suite so that it can be run on Wi-Fi only device.
2011-03-05 09:29:50 -08:00
Scott Main
2dcba736bd
am d75ff0e2: am fa331d0d: docs: update publishing doc to remove pname search parameter
...
* commit 'd75ff0e2965f28a5b3a93c6f4aeae306ebd2da79':
docs: update publishing doc to remove pname search parameter
2011-03-05 09:29:47 -08:00