Andrew Stadler
98f1b931af
Merge "Avoid NPE when reloading headers in single-pane mode"
2010-11-04 16:19:05 -07:00
Elliott Hughes
e0bc551ac3
Merge "Remove NetworkUtils.isIpAddress."
2010-11-04 16:09:04 -07:00
Gil Dobjanschi
fbda6a16dd
Merge "Added audio and video codec parameters to the export method."
2010-11-04 15:43:54 -07:00
Eric Rowe
54a77bd269
am 82fc12af: Merge "DO NOT MERGE Add acceptPair method to BT stress." into gingerbread
...
* commit '82fc12af416e351cb0a9d978734d585ab66d3f27':
DO NOT MERGE Add acceptPair method to BT stress.
2010-11-04 15:37:19 -07:00
Adam Powell
601e342d2a
Merge "Fix bug 3163150 - move holo extended themes to an overlay file."
2010-11-04 15:24:23 -07:00
Brian Carlstrom
b50d76971b
Merge "Add android.os.StrictMode.VmPolicy.Builder.detectLeakedClosableObjects API"
2010-11-04 15:12:31 -07:00
Eric Rowe
860417a853
Merge "DO NOT MERGE Add acceptPair method to BT stress." into gingerbread
2010-11-04 14:54:23 -07:00
Dmitry Shmidt
4ba3bbc80e
Merge "bugreport: Add bcm4329 internal counters dump"
2010-11-04 14:53:17 -07:00
Romain Guy
a29b13cfa9
Merge "Lines would not set the scissor before drawing."
2010-11-04 14:40:26 -07:00
Brian Carlstrom
45322d8f33
Merge "Integrate StrictMode with CloseGuard"
2010-11-04 14:32:33 -07:00
Daniel Sandler
4b3e3cc671
Merge "Rotation lock."
2010-11-04 14:15:56 -07:00
Chet Haase
d1e92d9a01
Merge "Adding JNI methods as a faster reflection mechanism"
2010-11-04 14:05:57 -07:00
Elliott Hughes
d1cf0545ad
Merge "Fix an off-by-one error."
2010-11-04 13:47:13 -07:00
Jason Sams
e8a5c362b9
Merge "Fix potental incremental build failure with leftover RS generated files."
2010-11-04 13:33:19 -07:00
Mike Lockwood
bec57dc3b6
Merge "MediaStore: Make definitions for Files table public"
2010-11-04 12:40:26 -07:00
Dianne Hackborn
2ff6030d58
Merge "StrictMode: now in more system server threads."
2010-11-04 12:21:48 -07:00
Romain Guy
b3c3196f49
Merge "Fix possible rendering issue when drawing a path."
2010-11-04 12:14:37 -07:00
Kenny Root
24e199a3a6
Merge "Add "nodpi" to DpiTest Android.mk"
2010-11-04 11:50:51 -07:00
Jamie Gennis
9842505c56
Merge "Fix a MediaBuffer leak in Stagefright."
2010-11-04 11:18:14 -07:00
Leon Scroggins
b4566b7fae
Merge "Use the new web email and password variations."
2010-11-04 11:11:42 -07:00
Xavier Ducrohet
5665469af7
Merge "Layoutlib native delegate: FloatMath."
2010-11-04 11:03:45 -07:00
Xavier Ducrohet
b153536f19
Merge "Layoutlib native delegate: path effects and xfermode."
2010-11-04 11:03:39 -07:00
Scott Main
2cdf9c7f24
am 13259f0b: am 17c87d80: Merge "docs: more revisions to the installing docs for GB" into gingerbread
...
* commit '13259f0ba08cde334a9b6760b20f14c269893652':
docs: more revisions to the installing docs for GB
2010-11-04 10:57:48 -07:00
Jean-Baptiste Queru
67265750c0
am 0d7c66b3: Merge 42c94791 from open-source master
...
* commit '0d7c66b3a555356315c17da48969fee28181ceda':
Fix the animation disappeared issue
2010-11-04 10:57:34 -07:00
Amith Yamasani
0a473c29e9
Merge "For extra large devices, use a dialog style for LauncherActivity."
2010-11-04 10:44:55 -07:00
James Dong
91e831b889
am c25c28a4: (-s ours) am c0fa1d47: Merge "Revert "Support rotation in media recorder"" into gingerbread
...
* commit 'c25c28a496012f64da57f5beb3b99f7424abb602':
Revert "Support rotation in media recorder"
2010-11-04 10:32:06 -07:00
Scott Main
b78cf0aa81
am 974ea38a: am 42361551: Merge "docs: some more edits to the sdk install docs" into gingerbread
...
* commit '974ea38a7c941eb8d85cea3b9a2ab87ed0b8e592':
docs: some more edits to the sdk install docs
2010-11-04 10:29:14 -07:00
Mathias Agopian
ce51b99b82
am b20c2e7c: am 477c4fee: Merge "[3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R." into gingerbread
...
* commit 'b20c2e7ca03f5ef2694b20ff9a7a10a7249eb936':
[3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R.
2010-11-04 10:29:09 -07:00
Hiroshi Lockheimer
8515b9cbab
am 0ce42c9d: (-s ours) am c181a082: Merge "Support rotation in media recorder" into gingerbread
...
* commit '0ce42c9d315ea6bf0e4f81b14b9e1a38f8979897':
Support rotation in media recorder
2010-11-04 10:29:05 -07:00
Gilles Debunne
ae64e5ba14
Merge "Tapping on paste popup with an empty clipboard does not crash in TextView."
2010-11-04 10:13:00 -07:00
Gilles Debunne
9aaa36b5c6
am 67e1ae5b: am 698dd812: Merge "ldpi assets created from hdpi in core." into gingerbread
...
* commit '67e1ae5b96bc3be5f9fc57350dada06194eb7f68':
ldpi assets created from hdpi in core.
2010-11-04 09:57:14 -07:00
Hiroshi Lockheimer
fb2be98105
am 5f5bcf50: am e0887cc7: Merge "Squash ANRs in UsbStorageActivity." into gingerbread
...
* commit '5f5bcf5039774050eec587dcc31905bd5a370b7b':
Squash ANRs in UsbStorageActivity.
2010-11-04 09:56:57 -07:00
Jason Chen
d5a56c520c
resolved conflicts for merge of f0452c25 to master
...
Change-Id: Ie8f5e81393ac965fd570f99239ab8be8ea0db00c
2010-11-04 09:29:55 -07:00
Scott Main
d8f7aa68d9
am 17c87d80: Merge "docs: more revisions to the installing docs for GB" into gingerbread
...
* commit '17c87d80c65d047c2db353d9826fef3e0d4d3535':
docs: more revisions to the installing docs for GB
2010-11-04 09:20:40 -07:00
Scott Main
07581f4ffd
Merge "docs: more revisions to the installing docs for GB" into gingerbread
2010-11-04 09:17:54 -07:00
Jean-Baptiste Queru
dd1cbdb9f9
Merge "Support changing style parent in overlays"
2010-11-04 07:26:37 -07:00
Jean-Baptiste Queru
ea4f07f93a
Merge 42c94791 from open-source master
...
Change-Id: Id17a1a787b6d46c44ba39d628129a3a27f6d70be
2010-11-04 07:22:44 -07:00
Scott Main
1096ee3f44
am d9bb6bc2: am 08810efc: docs: provide overview of the web apps docs and revise images in the targeting doc
...
* commit 'd9bb6bc283b3f7ee75da14c42c8a563214103c05':
docs: provide overview of the web apps docs and revise images in the targeting doc
2010-11-04 07:20:33 -07:00
satok
0af8273221
Merge "Find the most applicable subtype when there is no selected subtype but IME has subtypes"
2010-11-03 23:09:46 -07:00
Jason Sams
b98625164e
Merge "Update ScriptC constructor to remove depricated param."
2010-11-03 23:03:06 -07:00
Chet Haase
33c5844ab5
Merge "Fixed problem with setting updated values on existing animators"
2010-11-03 22:42:02 -07:00
Wink Saville
81cdad9bf7
Merge "Allow DataConnectionTrackers to manage multiple data connections."
2010-11-03 21:58:20 -07:00
Justin Ho
2158186d45
am ade230ed: (-s ours) am 112b5b1f: Merge "DO NOT MERGE - Updated VPNServices stat_sys icons" into gingerbread
...
* commit 'ade230ed99097a09584a793ce720cc869c9ffeb4':
DO NOT MERGE - Updated VPNServices stat_sys icons
2010-11-03 20:11:28 -07:00
Jeff Hamilton
8b4c5042a7
am 1212d4fd: am ef569469: Merge "Remove the My Tag feature." into gingerbread
...
* commit '1212d4fdc9bdc09c2c4c4d676b0918172eb09380':
Remove the My Tag feature.
2010-11-03 20:11:23 -07:00
Romain Guy
fb5e7c8b79
Merge "Fix rendering bug with saveLayerAlpha/drawColor."
2010-11-03 20:03:42 -07:00
James Dong
ecf5563442
am c0fa1d47: Merge "Revert "Support rotation in media recorder"" into gingerbread
...
* commit 'c0fa1d4791667ee8d1a9685749e42426fe8bd38b':
Revert "Support rotation in media recorder"
2010-11-03 19:44:45 -07:00
James Dong
fde60b39f9
Merge "Revert "Support rotation in media recorder"" into gingerbread
2010-11-03 19:42:17 -07:00
Scott Main
3be11ef1ff
am 42361551: Merge "docs: some more edits to the sdk install docs" into gingerbread
...
* commit '42361551b1e97884735b44dd49147ac133fa146e':
docs: some more edits to the sdk install docs
2010-11-03 18:04:56 -07:00
Scott Main
07a722fd22
Merge "docs: some more edits to the sdk install docs" into gingerbread
2010-11-03 18:03:01 -07:00
Mathias Agopian
55cdadc0a2
am 477c4fee: Merge "[3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R." into gingerbread
...
* commit '477c4feee2f0922dbc8952639cc12987d5cdce04':
[3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R.
2010-11-03 17:59:47 -07:00