ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity
19,310 Commits 2 Branches 0 Tags 54 MiB
24925bfba2
Commit Graph

19310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl Shapiro
3a498ef0a6 Merge "Remove overwritefree property. The underlying flag no longer exists." 2010-08-05 22:08:52 -07:00
Chung-yih Wang
344ca2b478 am 6866ecb9: am 1d62c773: Fix the build 
Merge commit '6866ecb92700a03b4285cb8427eedf579f9cf0ea'

* commit '6866ecb92700a03b4285cb8427eedf579f9cf0ea':
  Fix the build
 2010-08-05 21:13:25 -07:00
Chung-yih Wang
544727a476 am e7b92260: am b9605886: Merge "Revert "Revert "Move SIP telephony related codes to framework.""" into gingerbread 
Merge commit 'e7b92260e228039295874bea024b629cb5a4d89a'

* commit 'e7b92260e228039295874bea024b629cb5a4d89a':
  Revert "Revert "Move SIP telephony related codes to framework.""
 2010-08-05 21:11:09 -07:00
Chung-yih Wang
d2dd367058 am 1d62c773: Fix the build 
Merge commit '1d62c7737c33f92e79f0a180b05969f52484e64c' into gingerbread-plus-aosp

* commit '1d62c7737c33f92e79f0a180b05969f52484e64c':
  Fix the build
 2010-08-05 21:10:06 -07:00
Chung-yih Wang
c92d9221e4 resolved conflicts for merge of a06ad953 to master 
Change-Id: I282525787d7475cc72b2dec10fbc2cf8c5727b82
 2010-08-06 12:06:04 +08:00
Chung-yih Wang
bce20fffef am b9605886: Merge "Revert "Revert "Move SIP telephony related codes to framework.""" into gingerbread 
Merge commit 'b9605886d1a94de624b6feb5a81bb37f41653437' into gingerbread-plus-aosp

* commit 'b9605886d1a94de624b6feb5a81bb37f41653437':
  Revert "Revert "Move SIP telephony related codes to framework.""
 2010-08-05 19:38:04 -07:00
Chung-yih Wang
1f0b5d455c am 7324489f: Merge "Add SIP service into system server." into gingerbread 
Merge commit '7324489f18ee01586931f577f00567092cbf52df' into gingerbread-plus-aosp

* commit '7324489f18ee01586931f577f00567092cbf52df':
  Add SIP service into system server.
 2010-08-05 19:37:59 -07:00
Chung-yih Wang
9dcf6cf541 Merge "Revert "Revert "Move SIP telephony related codes to framework.""" into gingerbread 2010-08-05 19:35:54 -07:00
Chung-yih Wang
16458c8ee7 Merge "Add SIP service into system server." into gingerbread 2010-08-05 19:35:45 -07:00
Jason Sams
8f5f4b53be Merge "Fix length normilization bug in rsMatrixLoadRotate." 2010-08-05 19:08:46 -07:00
Romain Guy
15496aee19 Merge "Add 3d transformation test." 2010-08-05 19:08:15 -07:00
Adam Powell
39145e7838 am a68a0ebb: (-s ours) am 740aa4b2: am 90937179: (-s ours) Merge "DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller" into froyo 
Merge commit 'a68a0ebb51fdf00e0be0b77f03c6f3af3095973d'

* commit 'a68a0ebb51fdf00e0be0b77f03c6f3af3095973d':
  DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller
 2010-08-05 18:46:57 -07:00
Adam Powell
348765d7c4 am 740aa4b2: am 90937179: (-s ours) Merge "DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller" into froyo 
Merge commit '740aa4b2865a20700254314158bcb685514b2ac2' into gingerbread-plus-aosp

* commit '740aa4b2865a20700254314158bcb685514b2ac2':
  DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller
 2010-08-05 18:44:49 -07:00
Adam Powell
63e0b0d647 am 90937179: (-s ours) Merge "DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller" into froyo 
Merge commit '9093717985095913934c079abfa879049bd33ba5' into gingerbread

* commit '9093717985095913934c079abfa879049bd33ba5':
  DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller
 2010-08-05 18:39:37 -07:00
Adam Powell
2ce397899c Merge "DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller" into froyo 2010-08-05 18:33:31 -07:00
Fred Quintana
453d476575 am c2a836a5: am 5005a6c0: am cdf16787: Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo 
Merge commit 'c2a836a5f41897267aa92e5fdeecdf94203d640c'

* commit 'c2a836a5f41897267aa92e5fdeecdf94203d640c':
  Changed SyncOperation.toKey() to not rely on the implementation of
 2010-08-05 17:57:11 -07:00
Fred Quintana
2a45dcec26 am 5005a6c0: am cdf16787: Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo 
Merge commit '5005a6c031b5d66c1b47cad6f0dbaacebcbb6803' into gingerbread-plus-aosp

* commit '5005a6c031b5d66c1b47cad6f0dbaacebcbb6803':
  Changed SyncOperation.toKey() to not rely on the implementation of
 2010-08-05 17:51:28 -07:00
Fred Quintana
6b5cdc76df am cdf16787: Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo 
Merge commit 'cdf16787fc1234b7f21a9cddc6f8a27b4056bc39' into gingerbread

* commit 'cdf16787fc1234b7f21a9cddc6f8a27b4056bc39':
  Changed SyncOperation.toKey() to not rely on the implementation of
 2010-08-05 17:42:05 -07:00
Jason Sams
57e509812f Merge "Use lowp colors in fixed funtion emulation." 2010-08-05 17:39:52 -07:00
Fred Quintana
3e56d0b4a8 Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo 2010-08-05 17:36:27 -07:00
Eric Fischer
13ec2e5552 Merge "Import revised translations." 2010-08-05 17:27:46 -07:00
Romain Guy
16d47e240a Merge "Add support for paths." 2010-08-05 17:25:48 -07:00
Vasu Nori
5adfc23027 am bde1fc84: am 499b7438: Merge "(gingerbread) remove unused tests. bug:2898376" into gingerbread 
Merge commit 'bde1fc848d6b2b6b7e0dc9df99d77ae43264b333'

* commit 'bde1fc848d6b2b6b7e0dc9df99d77ae43264b333':
  (gingerbread) remove unused tests. bug:2898376
 2010-08-05 17:18:24 -07:00
Vasu Nori
3a489ccd2d am 499b7438: Merge "(gingerbread) remove unused tests. bug:2898376" into gingerbread 
Merge commit '499b743851aa84b9fc1a7e445e189946bc47ad5d' into gingerbread-plus-aosp

* commit '499b743851aa84b9fc1a7e445e189946bc47ad5d':
  (gingerbread) remove unused tests. bug:2898376
 2010-08-05 17:15:08 -07:00
Vasu Nori
9cd0c539f3 Merge "(gingerbread) remove unused tests. bug:2898376" into gingerbread 2010-08-05 17:11:53 -07:00
Scott Main
88827eabb3 am dd08aca6: am 432a2a1b: am 005e2400: Merge "fix xml sample error" into froyo 
Merge commit 'dd08aca684a3ddbeacd58591743e654fc4bc7581'

* commit 'dd08aca684a3ddbeacd58591743e654fc4bc7581':
  fix xml sample error
 2010-08-05 15:59:10 -07:00
Scott Main
56dbd906bc am 432a2a1b: am 005e2400: Merge "fix xml sample error" into froyo 
Merge commit '432a2a1bc7fb66e604772052f770857c149b2f97' into gingerbread-plus-aosp

* commit '432a2a1bc7fb66e604772052f770857c149b2f97':
  fix xml sample error
 2010-08-05 15:56:13 -07:00
Scott Main
1f1dfc8936 am 005e2400: Merge "fix xml sample error" into froyo 
Merge commit '005e2400b573b4b5e8ba3d2b3221ec958f9b0f2c' into gingerbread

* commit '005e2400b573b4b5e8ba3d2b3221ec958f9b0f2c':
  fix xml sample error
 2010-08-05 15:53:04 -07:00
Eric Fischer
cb49d1cbae Merge "Fix a bug where paragraph styles could leak onto an adjacent empty line." 2010-08-05 15:51:54 -07:00
Scott Main
6180fa278e Merge "fix xml sample error" into froyo 2010-08-05 15:49:08 -07:00
Jason Sams
03628a3a5b Merge "Fix behavior where the non-blocking sendToCliend would block when there was enough room for the message but not the message header." 2010-08-05 15:46:10 -07:00
Eric Rowe
092ffbae91 am 5c0f1e0a: am f9ea8ec5: am 982f1521: Merge "Checkin initial bluetooth stress tests." into froyo 
Merge commit '5c0f1e0a870b5792bbc0456eef6fd21642db3798'

* commit '5c0f1e0a870b5792bbc0456eef6fd21642db3798':
  Checkin initial bluetooth stress tests.
 2010-08-05 15:25:26 -07:00
James Dong
9444c9053d am 9c09a605: am 1441bdfc: Merge "Use the target color format from the camera source if possible" into gingerbread 
Merge commit '9c09a60513faf39901bb8e4681d39812204b3f73'

* commit '9c09a60513faf39901bb8e4681d39812204b3f73':
  Use the target color format from the camera source if possible
 2010-08-05 15:25:18 -07:00
Eric Rowe
07bf64be1c am f9ea8ec5: am 982f1521: Merge "Checkin initial bluetooth stress tests." into froyo 
Merge commit 'f9ea8ec57e1e1d5654f57c22f514954e242833d2' into gingerbread-plus-aosp

* commit 'f9ea8ec57e1e1d5654f57c22f514954e242833d2':
  Checkin initial bluetooth stress tests.
 2010-08-05 15:18:22 -07:00
James Dong
5d453bd8b7 am 1441bdfc: Merge "Use the target color format from the camera source if possible" into gingerbread 
Merge commit '1441bdfc19d6998607adf1347ed8dafc102908c9' into gingerbread-plus-aosp

* commit '1441bdfc19d6998607adf1347ed8dafc102908c9':
  Use the target color format from the camera source if possible
 2010-08-05 15:18:16 -07:00
Eric Rowe
9aee656691 am 982f1521: Merge "Checkin initial bluetooth stress tests." into froyo 
Merge commit '982f1521a662d274eca1216707d874f148396ac6' into gingerbread

* commit '982f1521a662d274eca1216707d874f148396ac6':
  Checkin initial bluetooth stress tests.
 2010-08-05 15:10:15 -07:00
James Dong
b8578072b2 Merge "Use the target color format from the camera source if possible" into gingerbread 2010-08-05 15:10:03 -07:00
Oscar Montemayor
87ccbaaed1 Merge "Fix for bug 2890320 Browser crashes, after adding bookmark. Simplified locking scheme in Proxy's getProxy(..) method. Also modified ContentObserver creation to be done from any thread." 2010-08-05 15:07:03 -07:00
Eric Rowe
5df494e1df Merge "Checkin initial bluetooth stress tests." into froyo 2010-08-05 14:49:22 -07:00
James Dong
6b5fcef29e am 41b29cb0: am 3aad8c38: Merge "Fix an issue where the track duration does not include the last sample duration" into gingerbread 
Merge commit '41b29cb0a8e04e553357662b81bffea26f1c2d84'

* commit '41b29cb0a8e04e553357662b81bffea26f1c2d84':
  Fix an issue where the track duration does not include the last sample duration
 2010-08-05 14:25:59 -07:00
Brian Carlstrom
d1a48a3d63 resolved conflicts for merge of 1b7e4d5a to master 
Change-Id: Ib3f8e1bffb759dbe5ef5e681ac872e9a9b70c24e
 2010-08-05 14:02:36 -07:00
Mike Lockwood
c74760e52c Merge "Clean up error handling in custom sqlite function dispatching" 2010-08-05 12:53:37 -07:00
Andreas Huber
684ad894ac am 870678a9: am 2c37f3d3: Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread 
Merge commit '870678a954e1e2a96caf76453c20de808253ffd1'

* commit '870678a954e1e2a96caf76453c20de808253ffd1':
  Better support for fake timestamps in RTP, H.263 video now also requests FIR.
 2010-08-05 12:09:22 -07:00
Andreas Huber
9beb046ad0 am 2405988f: am 407ec58c: Merge "A better fix for the OggExtractor referring to the sample rate while it hasn\'t been initialized yet." into gingerbread 
Merge commit '2405988fa07dfc7f6607cafe75322326628a9f52'

* commit '2405988fa07dfc7f6607cafe75322326628a9f52':
  A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet.
 2010-08-05 12:09:18 -07:00
Kenny Root
71c83c4d50 am 983d4583: am dec43a10: Merge "Fix up PackageManager tests" into gingerbread 
Merge commit '983d4583e7bb1788d377296fe34babc1956c0a3c'

* commit '983d4583e7bb1788d377296fe34babc1956c0a3c':
  Fix up PackageManager tests
 2010-08-05 12:09:10 -07:00
Andreas Huber
a717742632 am c6d1519e: am fb861523: Merge "Specification of codec specific data as part of the session description is now optional." into gingerbread 
Merge commit 'c6d1519e549740abd56df7a98b5348bd9095ae46'

* commit 'c6d1519e549740abd56df7a98b5348bd9095ae46':
  Specification of codec specific data as part of the session description is now optional.
 2010-08-05 12:09:04 -07:00
Chung-yih Wang
f60cd3792d am bc088dde: am cde66df4: Revert "Move SIP telephony related codes to framework." 
Merge commit 'bc088ddecb05de39f7e96e44de394add975baecd'

* commit 'bc088ddecb05de39f7e96e44de394add975baecd':
  Revert "Move SIP telephony related codes to framework."
 2010-08-05 12:08:43 -07:00
Chung-yih Wang
a0dcd41855 am d088cef7: am 468e35ef: Merge "Move SIP telephony related codes to framework." into gingerbread 
Merge commit 'd088cef7da5f17b6d1ea16196c24032f39c9eb32'

* commit 'd088cef7da5f17b6d1ea16196c24032f39c9eb32':
  Move SIP telephony related codes to framework.
 2010-08-05 12:08:30 -07:00
Daniel Sandler
2ded2eb139 am 811d66f1: am 9b87770f: Merge "Fix crash when startForeground posts a broken Notification." into gingerbread 
Merge commit '811d66f1496b64b02c117e8d992db99e9e6cdc8d'

* commit '811d66f1496b64b02c117e8d992db99e9e6cdc8d':
  Fix crash when startForeground posts a broken Notification.
 2010-08-05 12:08:25 -07:00
Chung-yih Wang
7ae0a75f45 am bbd1a04c: am 8c503569: Merge "Move the sip related codes to framework." into gingerbread 
Merge commit 'bbd1a04c628f6756085797423794020ccde70c5c'

* commit 'bbd1a04c628f6756085797423794020ccde70c5c':
  Move the sip related codes to framework.
 2010-08-05 12:08:20 -07:00