Eric Rowe
27538f6540
am 288f1373: am 8de43ab5: Merge "Change disable timeout for BT disable stress test" into gingerbread
...
Merge commit '288f13730e6535fb36581781196a55a6f2d198d6'
* commit '288f13730e6535fb36581781196a55a6f2d198d6':
Change disable timeout for BT disable stress test
2010-10-22 18:31:31 -07:00
Nick Pelly
85ac552f10
am f5b5d177: am 07f3bee2: Push Tag/NdefTag implementation details into the service.
...
Merge commit 'f5b5d177a94bf5b1e59c11fb6f53e2dd40271f59'
* commit 'f5b5d177a94bf5b1e59c11fb6f53e2dd40271f59':
Push Tag/NdefTag implementation details into the service.
2010-10-22 18:31:06 -07:00
Eric Fischer
3f965b9ede
am ecae6e06: Merge "Import translations for status bar." into gingerbread
...
Merge commit 'ecae6e06a3bed9b6ab108629e4180fe55f4726ed' into gingerbread-plus-aosp
* commit 'ecae6e06a3bed9b6ab108629e4180fe55f4726ed':
Import translations for status bar.
2010-10-22 18:21:14 -07:00
Eric Rowe
c9ce2b21d7
am 8de43ab5: Merge "Change disable timeout for BT disable stress test" into gingerbread
...
Merge commit '8de43ab5ba818b9552326d5383729b3e6fbf7c82' into gingerbread-plus-aosp
* commit '8de43ab5ba818b9552326d5383729b3e6fbf7c82':
Change disable timeout for BT disable stress test
2010-10-22 18:21:09 -07:00
Nick Pelly
c6c9185661
am 07f3bee2: Push Tag/NdefTag implementation details into the service.
...
Merge commit '07f3bee2db8b6e93ebbf7222676bd9f468e85569' into gingerbread-plus-aosp
* commit '07f3bee2db8b6e93ebbf7222676bd9f468e85569':
Push Tag/NdefTag implementation details into the service.
2010-10-22 18:20:52 -07:00
Adam Powell
421e60cff4
Merge "Fix bug 3105695 - Action modes in dialogs or other small windows"
2010-10-22 17:52:01 -07:00
Dianne Hackborn
bfd5a120e1
Merge "Implement issue #3116702 : New manifest tags for supported screen sizes"
2010-10-22 17:16:12 -07:00
Eric Fischer
518ee6fe95
Merge "Import translations for status bar." into gingerbread
2010-10-22 17:14:36 -07:00
Eric Rowe
4f6f494562
Merge "Change disable timeout for BT disable stress test" into gingerbread
2010-10-22 17:14:12 -07:00
Eric Fischer
0cbf3fb6ae
am d13f5f4f: (-s ours) am 67496e59: Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-10-22 16:10:25 -07:00
Eric Fischer
04b7b009c9
am 67496e59: Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-10-22 16:08:27 -07:00
Eric Fischer
2e960b21a8
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-10-22 16:06:38 -07:00
Eric Fischer
aea4decb80
am 26dc88af: am a3e70a43: Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread
2010-10-22 16:04:33 -07:00
Brad Fitzpatrick
fe731290d3
Merge "Expose (internally only) the number of animations currently running."
2010-10-22 16:01:55 -07:00
Eric Fischer
b0dedf53ca
am a3e70a43: Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread
2010-10-22 16:01:34 -07:00
Eric Fischer
372f65ccf6
Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread
2010-10-22 15:59:42 -07:00
Xavier Ducrohet
d119af7703
Merge "Layoutlib_Create: Fix order of class adapters."
2010-10-22 15:42:40 -07:00
Xavier Ducrohet
abbbacd8d7
Merge "Layoutlib_create: fix binary name of delegate methods."
2010-10-22 15:42:26 -07:00
Shimeng (Simon) Wang
5a4fe41b22
Merge "Let double tap reflow text."
2010-10-22 15:26:03 -07:00
Shimeng (Simon) Wang
5082b042f5
Merge "Ignore viewport viewScale in fixed viewport mode."
2010-10-22 15:25:00 -07:00
Gilles Debunne
6e88cac900
Merge "Fix for 3124993. Crash in Browser on long press."
2010-10-22 14:51:15 -07:00
Dianne Hackborn
c01d0f9bb8
resolved conflicts for merge of 9c7489f8 to master
...
Change-Id: I1d8fd1146925f48ad690c89230d24dc8694703f4
2010-10-22 14:35:09 -07:00
James Dong
c982f887c9
Merge "OMX extension to support storing meta data in video input buffers during recording"
2010-10-22 14:07:41 -07:00
Dianne Hackborn
eeb96f63d2
am 38993d8d: Merge "Fix issue #3122240 : Expose xlarge in GB." into gingerbread
2010-10-22 14:03:08 -07:00
Xavier Ducrohet
2cc1c8e1db
Merge "Remove dependency on ASM util classes."
2010-10-22 14:03:07 -07:00
Dianne Hackborn
91d5ae02fd
Merge "Fix issue #3122240 : Expose xlarge in GB." into gingerbread
2010-10-22 14:01:25 -07:00
Xavier Ducrohet
a181008a8a
am 2051a1be: am c5371fad: Merge "Make layoutlib use the prebuilt of layoutlib_api"
2010-10-22 13:41:08 -07:00
Xavier Ducrohet
1664611649
am c5371fad: Merge "Make layoutlib use the prebuilt of layoutlib_api"
2010-10-22 13:38:58 -07:00
Xavier Ducrohet
68a821e3f1
Merge "Make layoutlib use the prebuilt of layoutlib_api"
2010-10-22 13:28:39 -07:00
Brian Carlstrom
f98f11f49e
Merge "Move improved cert chain handling from CertificateChainValidator to TrustManagerImpl"
2010-10-22 13:02:44 -07:00
Kenny Root
417518219a
am faf53c0b: am 40763914: Merge "Exit immediately on some linklib failures" into gingerbread
2010-10-22 12:31:26 -07:00
Justin Ho
e82f7efea3
am 02482e20: (-s ours) am 0b01eb26: Merge "DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator" into gingerbread
2010-10-22 12:31:22 -07:00
Dianne Hackborn
0952382eab
am 4f734cab: am 7ce276b5: Merge "Update script for copying NDK headers/library." into gingerbread
2010-10-22 12:31:09 -07:00
Jeff Hamilton
ba0f58b141
am 8783b0e2: am 7c68bc38: Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread
2010-10-22 12:30:54 -07:00
Kenny Root
e37e0f6ceb
Merge "Reorganize PackageManager dump to avoid NPE"
2010-10-22 12:21:16 -07:00
Kenny Root
3da138760f
am 40763914: Merge "Exit immediately on some linklib failures" into gingerbread
2010-10-22 12:18:46 -07:00
Kenny Root
d0c1be3039
Merge "Exit immediately on some linklib failures" into gingerbread
2010-10-22 12:17:02 -07:00
Justin Ho
5f2b657328
am 0b01eb26: Merge "DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator" into gingerbread
2010-10-22 12:15:36 -07:00
Justin Ho
df8353fda0
Merge "DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator" into gingerbread
2010-10-22 12:14:26 -07:00
Dianne Hackborn
0110cb557c
am 7ce276b5: Merge "Update script for copying NDK headers/library." into gingerbread
2010-10-22 12:11:33 -07:00
Jeff Hamilton
17d9f81326
am 7c68bc38: Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread
2010-10-22 12:11:23 -07:00
Romain Guy
52a2315a0a
Merge "Don't use two different variables to refer to mSnapshot."
2010-10-22 11:33:53 -07:00
Wei-Ta Chen
c965ad732f
Merge "Fix 3122139, where previewing an attachment for the second time will fail."
2010-10-22 11:22:59 -07:00
Daniel Sandler
d00f4a0ee0
Merge "Refinements to the notification icon area."
2010-10-22 11:15:04 -07:00
Dianne Hackborn
08c93a781d
Merge "Update script for copying NDK headers/library." into gingerbread
2010-10-22 10:58:35 -07:00
Dmitri Plotnikov
2dd1f42b1d
Merge "Moving cursor to the end of the search query when set explicitly."
2010-10-22 10:54:51 -07:00
Romain Guy
baea1f1bef
Merge "Don't perform glCopyTextImage with coordinates outside the buffer."
2010-10-22 10:42:48 -07:00
Shimeng (Simon) Wang
98c396a5d2
Merge "Pass whether a scroll is user-scrolled or not to webkit."
2010-10-22 10:30:57 -07:00
Jeff Hamilton
ecfb0ff159
Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread
2010-10-22 10:20:06 -07:00
Joe Onorato
f6cf998109
Merge "Fix bug introduced in Change I856118d8."
2010-10-22 09:22:50 -07:00
