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
Hiroshi Lockheimer
284f432b75
am c181a082: Merge "Support rotation in media recorder" into gingerbread
...
* commit 'c181a08209dc85c80e4da5d20cd3980998def40d':
Support rotation in media recorder
2010-11-03 17:59:43 -07:00
Mathias Agopian
61ee1a86df
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
2010-11-03 17:57:32 -07:00
Hiroshi Lockheimer
2c08def60c
Merge "Support rotation in media recorder" into gingerbread
2010-11-03 17:57:28 -07:00
Gilles Debunne
17cf27a872
am 698dd812: Merge "ldpi assets created from hdpi in core." into gingerbread
...
* commit '698dd8127636fcf57c56dcc90688fb5e8afb8abb':
ldpi assets created from hdpi in core.
2010-11-03 17:38:50 -07:00
Gilles Debunne
7b9085d53b
Merge "ldpi assets created from hdpi in core." into gingerbread
2010-11-03 17:37:28 -07:00
Hiroshi Lockheimer
57548f0cb3
am e0887cc7: Merge "Squash ANRs in UsbStorageActivity." into gingerbread
...
* commit 'e0887cc7febe2a03f1685e4aa3cb131c455d8cd0':
Squash ANRs in UsbStorageActivity.
2010-11-03 17:10:33 -07:00
Hiroshi Lockheimer
e51cdee3eb
Merge "Squash ANRs in UsbStorageActivity." into gingerbread
2010-11-03 17:08:03 -07:00
Dmitry Shmidt
b606fa90f1
Merge "bugreport: Fix dump of netcfg command"
2010-11-03 17:06:29 -07:00
Robert Greenwalt
85c4ddd6db
Merge "Add some network/phone type constants."
2010-11-03 17:05:24 -07:00
Romain Guy
8d83ad9542
Merge "Fix rendering issue with layers."
2010-11-03 16:23:41 -07:00
Alexander Lucas
2b7865c81d
am 6f4a084e: Merge "Added SIP Demo" into gingerbread
...
* commit '6f4a084e33c917b7e04309a4296404aef7325fca':
Added SIP Demo
2010-11-03 15:35:29 -07:00
Alexander Lucas
211a28eaae
Merge "Added SIP Demo" into gingerbread
2010-11-03 15:32:57 -07:00
Scott Main
4cb81c01b2
am 08810efc: docs: provide overview of the web apps docs and revise images in the targeting doc
...
* commit '08810efc1a1868261fb042355f75ab049438b6e3':
docs: provide overview of the web apps docs and revise images in the targeting doc
2010-11-03 15:18:10 -07:00
Jaikumar Ganesh
18765af648
Merge "Add STATE_AUDIO_CONNECTING state."
2010-11-03 14:58:00 -07:00
Andreas Huber
7ccd10dde8
Merge "Experimentally reenable mpeg4 and h.263 hardware decoders."
2010-11-03 14:40:27 -07:00
Shimeng (Simon) Wang
527970679d
Merge "Prevent 0 content width."
2010-11-03 14:33:28 -07:00
Jason Sams
44254951ea
Merge "RS Error cleanup. Thow java exception during init if the GL driver fails rather than native crash."
2010-11-03 14:29:16 -07:00