Jean-Baptiste Queru
22285363d9
Merge db2403ff from open-source master
...
Change-Id: I90dfa2f37db901b62690b6becbf5d0d91468672c
2010-11-05 07:53:24 -07:00
Dan Bornstein
7ac1ff2e16
am 265acc50: am 05cc2d63: (-s ours) This class no longer exists.
...
* commit '265acc5085ad03c4c043dd33faed808b55732134':
This class no longer exists.
2010-11-04 17:12:16 -07:00
Dan Bornstein
26fbc727b2
am 7dbeb24a: This class no longer exists.
...
* commit '7dbeb24a9fa950ec99fbcd8cbfcfdd8199de3d86':
This class no longer exists.
2010-11-04 17:12:10 -07:00
Dan Bornstein
a8aaf181b1
am 05cc2d63: (-s ours) This class no longer exists.
...
* commit '05cc2d635eba165098a8ff58678a2ef1db5ddd1a':
This class no longer exists.
2010-11-04 16:30:06 -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
Eric Rowe
860417a853
Merge "DO NOT MERGE Add acceptPair method to BT stress." into gingerbread
2010-11-04 14:54:23 -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
ea4f07f93a
Merge 42c94791 from open-source master
...
Change-Id: Id17a1a787b6d46c44ba39d628129a3a27f6d70be
2010-11-04 07:22:44 -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
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
Justin Ho
82d5353f73
am 112b5b1f: Merge "DO NOT MERGE - Updated VPNServices stat_sys icons" into gingerbread
...
* commit '112b5b1f304846a1f6999a8347f45dae43719b8f':
DO NOT MERGE - Updated VPNServices stat_sys icons
2010-11-03 13:43:09 -07:00
Justin Ho
87933f223c
Merge "DO NOT MERGE - Updated VPNServices stat_sys icons" into gingerbread
2010-11-03 13:39:26 -07:00
Jeff Hamilton
ab29443cd4
am ef569469: Merge "Remove the My Tag feature." into gingerbread
...
* commit 'ef5694692f88bb91ed6ee1191b11a66ec594ff39':
Remove the My Tag feature.
2010-11-03 13:37:22 -07:00
Jeff Hamilton
8de195a531
Merge "Remove the My Tag feature." into gingerbread
2010-11-03 13:34:39 -07:00
Daniel Sandler
bceacf01a5
am 65816a32: Merge "Fix the fix for storage ANRs." into gingerbread
...
* commit '65816a32ee2c2181895e3be636f3173a6e769f67':
Fix the fix for storage ANRs.
2010-11-03 12:38:40 -07:00
Daniel Sandler
9fd94b9d10
Merge "Fix the fix for storage ANRs." into gingerbread
2010-11-03 12:36:31 -07:00
Brad Fitzpatrick
0e97e9a239
Merge "Add support for UAProf header in HTTP requests"
2010-11-03 11:38:06 -07:00
Jean-Baptiste Queru
5f3c2b79fa
Merge "Fix the animation disappeared issue"
2010-11-03 10:16:30 -07:00
James Dong
a2adbcb004
am f3847e87: Merge "DO NOT MERGE" into gingerbread
...
* commit 'f3847e875eb1c58094a2d159a2a6f3f0b381d77a':
DO NOT MERGE
2010-11-03 09:25:08 -07:00
James Dong
15d9a6ddd8
Merge "DO NOT MERGE" into gingerbread
2010-11-03 09:21:44 -07:00
Dianne Hackborn
4397ab9989
am 906b830d: Revert "UMS: Avoid SystemUI ANRs during long vold operations."
...
* commit '906b830d1d61cbd8b1f9c2dc87e564cfb0f315fd':
Revert "UMS: Avoid SystemUI ANRs during long vold operations."
2010-11-02 22:28:10 -07:00
Daniel Sandler
3c2ad1b44b
am cbc3219d: Merge "UMS: Avoid SystemUI ANRs during long vold operations." into gingerbread
...
* commit 'cbc3219d2864a0b8d8ee6cda2c0b9a679bdeb200':
UMS: Avoid SystemUI ANRs during long vold operations.
2010-11-02 20:35:17 -07:00
Daniel Sandler
49affef924
Merge "UMS: Avoid SystemUI ANRs during long vold operations." into gingerbread
2010-11-02 20:34:10 -07:00
Jason parks
02b8c9b3c9
am 73eba2a6: Merge "Return a zero length byte from toByteArray instead of null." into gingerbread
...
* commit '73eba2a6bcf39eb20d815517ed11e1a7fb7a2c39':
Return a zero length byte from toByteArray instead of null.
2010-11-02 19:00:12 -07:00
Jason parks
e58a1272a8
Merge "Return a zero length byte from toByteArray instead of null." into gingerbread
2010-11-02 18:58:09 -07:00
Dirk Dougherty
ea1ba55135
am 4e4d0d5f: am 36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." into froyo
...
* commit '4e4d0d5f207421b0a2ce134fe17d7c78defc9dac':
Doc change: Update uses-feature and permissions docs.
2010-11-02 17:47:20 -07:00
Dirk Dougherty
3f28855222
am 36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." into froyo
...
* commit '36a1bcee76d35636b4050674eb98285c3a3a6c2f':
Doc change: Update uses-feature and permissions docs.
2010-11-02 17:43:54 -07:00
Dirk Dougherty
5eb239555c
Merge "Doc change: Update uses-feature and permissions docs." into froyo
2010-11-02 17:40:27 -07:00
Brad Fitzpatrick
55475ca712
am 9df48a03: Merge "NotificationManager: droiddoc documentation improvements"
...
* commit '9df48a0305818122298a86ae9949f6688814928b':
NotificationManager: droiddoc documentation improvements
2010-11-02 15:00:06 -07:00
Gloria Wang
3c7c44aae0
am ef8a810b: Merge "Update of DRM framework"
...
* commit 'ef8a810b3b11d177a64111125eaa44bb76624414':
Update of DRM framework
2010-11-02 14:59:51 -07:00
Brad Fitzpatrick
0d4ee6683b
Merge "NotificationManager: droiddoc documentation improvements"
2010-11-02 14:55:21 -07:00
Nick Pelly
c5d080fe89
am 38e561dd: Merge "Remove timeout support." into gingerbread
...
* commit '38e561dd3cd72160035d8b3002fc9bbaf3071374':
Remove timeout support.
2010-11-02 14:49:35 -07:00
Nick Pelly
967c143f91
Merge "Remove timeout support." into gingerbread
2010-11-02 14:46:46 -07:00
Gloria Wang
b8563353d5
Merge "Update of DRM framework"
2010-11-02 14:45:02 -07:00
Jean-Baptiste Queru
55d75a9532
am bbd212d7: Merge "Document per-implementation behaviors of native get* methods"
...
* commit 'bbd212d77852be155a815a0d2ad1da0df2c0dfe1':
Document per-implementation behaviors of native get* methods
2010-11-02 14:18:07 -07:00
Jean-Baptiste Queru
84b0164224
am 715f8610: Merge "Clarify documentation of Cursor get* methods."
...
* commit '715f86107763ee95e7d6558dd8da390a63da63e2':
Clarify documentation of Cursor get* methods.
2010-11-02 14:18:02 -07:00