ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity
20,811 Commits 2 Branches 0 Tags 54 MiB
f048a4b530
Commit Graph

20811 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
f048a4b530 am fa888784: am 89fef418: Merge "Avoid pre-processing images when they won\'t be used" 
Merge commit 'fa8887848e2877dd96e853dfcd52086f1b66c26b'

* commit 'fa8887848e2877dd96e853dfcd52086f1b66c26b':
  Avoid pre-processing images when they won't be used
 2010-09-10 15:01:56 -07:00
Jean-Baptiste Queru
5f9411a539 am e3dabc4b: am beeb71df: fix build 
Merge commit 'e3dabc4bc4ad977d8b126e644e4328e70bd58b72'

* commit 'e3dabc4bc4ad977d8b126e644e4328e70bd58b72':
  fix build
 2010-09-10 15:01:50 -07:00
Jean-Baptiste Queru
6667c2f101 am 03b3eda2: am 862438eb: fix build 
Merge commit '03b3eda2f87bc2d837586303585321f073ef5c6a'

* commit '03b3eda2f87bc2d837586303585321f073ef5c6a':
  fix build
 2010-09-10 15:00:34 -07:00
Jean-Baptiste Queru
2f0a714e0c am 3b3d2160: am 7547b8ea: fix build 
Merge commit '3b3d2160b7c8a17f44476d34408296264d57f2cc'

* commit '3b3d2160b7c8a17f44476d34408296264d57f2cc':
  fix build
 2010-09-10 15:00:12 -07:00
Jean-Baptiste Queru
f0e707a5d0 am 6fc97b35: am 93548db6: fix build 
Merge commit '6fc97b35008b9df10085ee24ca71ec58fc2f74ae'

* commit '6fc97b35008b9df10085ee24ca71ec58fc2f74ae':
  fix build
 2010-09-10 15:00:03 -07:00
Joe Onorato
75c323317c am ebdac324: (-s ours) am 81fe092d: Merge "Make @deprecated without a comment an error DO NOT MERGE" into gingerbread 
Merge commit 'ebdac324a8c65ade0f558fdf1a7f33aa0149470d'

* commit 'ebdac324a8c65ade0f558fdf1a7f33aa0149470d':
  Make @deprecated without a comment an error DO NOT MERGE
 2010-09-10 14:52:21 -07:00
Joe Onorato
f2736e4ff3 am fb71733b: am 7c8258d0: Merge "Fix the last remaining @deprecated tag without comment warning." into gingerbread 
Merge commit 'fb71733b352494cb6bc40b26f251dcd3ece63ed5'

* commit 'fb71733b352494cb6bc40b26f251dcd3ece63ed5':
  Fix the last remaining @deprecated tag without comment warning.
 2010-09-10 14:52:11 -07:00
Scott Main
fdc2e56dda am 4cf0f45d: am 3b202844: am 51c18989: docs: update platform dashboard 
Merge commit '4cf0f45d6589d671be443471ea706bc7f299fbf1'

* commit '4cf0f45d6589d671be443471ea706bc7f299fbf1':
  docs: update platform dashboard
 2010-09-10 14:51:23 -07:00
Wink Saville
b64c502d29 am 8d8fce88: (-s ours) am 9a3ce10c: Merge "Fix bug 2972138 Lost cell data connection and didn\'t get it back, DO NOT MERGE." into gingerbread 
Merge commit '8d8fce88217f8c4ddd3763e230887cb2359c1a1f'

* commit '8d8fce88217f8c4ddd3763e230887cb2359c1a1f':
  Fix bug 2972138 Lost cell data connection and didn't get it back, DO NOT MERGE.
 2010-09-10 14:51:14 -07:00
Mathias Agopian
7cbf44d4eb Merge "Add support for KHR_fence_sync" 2010-09-10 14:29:26 -07:00
Nipun Kwatra
a46954577e Merge "Added specific resolution and time lapse profiles." 2010-09-10 14:26:45 -07:00
Mathias Agopian
c291f58585 Add support for KHR_fence_sync 
Change-Id: Ie2771b5869c9c8dcf5ecf9318e2ee6d4d1cd5cc9
 2010-09-10 14:01:45 -07:00
Vasu Nori
1c4d3eda90 Merge "Return count of rows in a resultset only once (when startPos = 0)" 2010-09-10 13:45:45 -07:00
Xavier Ducrohet
218d44ea1a am 89fef418: Merge "Avoid pre-processing images when they won\'t be used" 
Merge commit '89fef4183a3c58aebbbf66e894bbdc1ae9f634e9' into gingerbread-plus-aosp

* commit '89fef4183a3c58aebbbf66e894bbdc1ae9f634e9':
  Avoid pre-processing images when they won't be used
 2010-09-10 13:03:43 -07:00
Jean-Baptiste Queru
bb07c1d782 am beeb71df: fix build 
Merge commit 'beeb71dfd4ffe635daba3745515bb392f7c5ada2' into gingerbread-plus-aosp

* commit 'beeb71dfd4ffe635daba3745515bb392f7c5ada2':
  fix build
 2010-09-10 13:03:38 -07:00
Jean-Baptiste Queru
69297e5c07 am 862438eb: fix build 
Merge commit '862438eb69297accde289230f4c4623b56a39458' into gingerbread-plus-aosp

* commit '862438eb69297accde289230f4c4623b56a39458':
  fix build
 2010-09-10 13:03:33 -07:00
Jean-Baptiste Queru
6813dc9de5 am 7547b8ea: fix build 
Merge commit '7547b8eac6a4011683a93f51fdabf5a978e1f18c' into gingerbread-plus-aosp

* commit '7547b8eac6a4011683a93f51fdabf5a978e1f18c':
  fix build
 2010-09-10 13:03:29 -07:00
Jean-Baptiste Queru
e0438ec455 am 93548db6: fix build 
Merge commit '93548db645dd4fd2b9c1dd270421ac0b38de720e' into gingerbread-plus-aosp

* commit '93548db645dd4fd2b9c1dd270421ac0b38de720e':
  fix build
 2010-09-10 13:03:24 -07:00
Joe Onorato
691363f9eb am 81fe092d: Merge "Make @deprecated without a comment an error DO NOT MERGE" into gingerbread 
Merge commit '81fe092d11607912944a49c47df6c14e28a977b8' into gingerbread-plus-aosp

* commit '81fe092d11607912944a49c47df6c14e28a977b8':
  Make @deprecated without a comment an error DO NOT MERGE
 2010-09-10 12:49:15 -07:00
Joe Onorato
2d3d72ac1c am 7c8258d0: Merge "Fix the last remaining @deprecated tag without comment warning." into gingerbread 
Merge commit '7c8258d064efe70e8551480eaafd7296f659acd5' into gingerbread-plus-aosp

* commit '7c8258d064efe70e8551480eaafd7296f659acd5':
  Fix the last remaining @deprecated tag without comment warning.
 2010-09-10 12:46:52 -07:00
Joe Onorato
1fb9730c03 Merge "Make @deprecated without a comment an error DO NOT MERGE" into gingerbread 2010-09-10 12:45:18 -07:00
Joe Onorato
feec77f426 Merge "Fix the last remaining @deprecated tag without comment warning." into gingerbread 2010-09-10 12:44:36 -07:00
Scott Main
2626a50a40 am 3b202844: am 51c18989: docs: update platform dashboard 
Merge commit '3b202844fef5eb1a213bd7108dd1b6d42b1d9c64' into gingerbread-plus-aosp

* commit '3b202844fef5eb1a213bd7108dd1b6d42b1d9c64':
  docs: update platform dashboard
 2010-09-10 12:39:57 -07:00
Scott Main
76107392f7 am 51c18989: docs: update platform dashboard 
Merge commit '51c18989cf44d14a7ff82c45d9886b7ea55bd068' into gingerbread

* commit '51c18989cf44d14a7ff82c45d9886b7ea55bd068':
  docs: update platform dashboard
 2010-09-10 12:34:06 -07:00
Wink Saville
f977b9f9db Merge "Fix bug 2972138 Lost cell data connection and didn't get it back." 2010-09-10 11:36:53 -07:00
James Dong
821ccf9950 am 2432248b: am 4709c7fa: Merge "Fixed a copy and paste error" into gingerbread 
Merge commit '2432248b03c675812dbb2154e2535bf3ada54b0a'

* commit '2432248b03c675812dbb2154e2535bf3ada54b0a':
  Fixed a copy and paste error
 2010-09-10 11:34:15 -07:00
Wink Saville
f3f3ad42ec am 9a3ce10c: Merge "Fix bug 2972138 Lost cell data connection and didn\'t get it back, DO NOT MERGE." into gingerbread 
Merge commit '9a3ce10c6cafa4a2528ce9f3fdb6163acf5eb7b2' into gingerbread-plus-aosp

* commit '9a3ce10c6cafa4a2528ce9f3fdb6163acf5eb7b2':
  Fix bug 2972138 Lost cell data connection and didn't get it back, DO NOT MERGE.
 2010-09-10 11:32:36 -07:00
Eric Laurent
65a7b1da17 am ea4680f0: am 2814ad25: Merge "LVM release 1.09 delivery" into gingerbread 
Merge commit 'ea4680f007c9fbc1ff73a6b161e6e83ebaeff981'

* commit 'ea4680f007c9fbc1ff73a6b161e6e83ebaeff981':
  LVM release 1.09 delivery
 2010-09-10 11:30:16 -07:00
Wink Saville
401a1c673e Merge "Fix bug 2972138 Lost cell data connection and didn't get it back, DO NOT MERGE." into gingerbread 2010-09-10 11:30:15 -07:00
Erik
2b8ecb8131 am a388a324: Merge branch \'gingerbread-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into gingerbread-plus-aosp 
Merge commit 'a388a3245dfeea057bc7ec6b62e474994b3ff946'

* commit 'a388a3245dfeea057bc7ec6b62e474994b3ff946':
 2010-09-10 11:30:00 -07:00
Robert Greenwalt
7f9c52076a am d4e722b7: am 34763928: Merge "add ART for inet connection condition" into gingerbread 
Merge commit 'd4e722b74f4a5c58db03dd94d79f192c0a9b3004'

* commit 'd4e722b74f4a5c58db03dd94d79f192c0a9b3004':
  add ART for inet connection condition
 2010-09-10 11:29:54 -07:00
Jean-Baptiste Queru
13c2d16ed6 am 09f1e2b2: resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aosp 
Merge commit '09f1e2b2151ea18c05b9138a0a5cb63af18ea373'

* commit '09f1e2b2151ea18c05b9138a0a5cb63af18ea373':
  Initial contribution from Sony Corporation.
 2010-09-10 11:29:10 -07:00
James Dong
addf68947c am 4709c7fa: Merge "Fixed a copy and paste error" into gingerbread 
Merge commit '4709c7faaa7d14b136dd3b1d8126f972ee11a1aa' into gingerbread-plus-aosp

* commit '4709c7faaa7d14b136dd3b1d8126f972ee11a1aa':
  Fixed a copy and paste error
 2010-09-10 11:25:24 -07:00
James Dong
425981524a Merge "Fixed a copy and paste error" into gingerbread 2010-09-10 11:21:42 -07:00
Eric Laurent
10eea1e277 am 2814ad25: Merge "LVM release 1.09 delivery" into gingerbread 
Merge commit '2814ad25578d1a52826464477da16217247c04e0' into gingerbread-plus-aosp

* commit '2814ad25578d1a52826464477da16217247c04e0':
  LVM release 1.09 delivery
 2010-09-10 10:26:51 -07:00
Eric Laurent
215af644b3 Merge "LVM release 1.09 delivery" into gingerbread 2010-09-10 10:24:02 -07:00
Erik
057da22c30 Merge branch 'gingerbread-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into gingerbread-plus-aosp 2010-09-10 10:07:25 -07:00
Robert Greenwalt
778f695119 am 34763928: Merge "add ART for inet connection condition" into gingerbread 
Merge commit '34763928c995a15ee0b9ecfb7c0f4772ef20f2ea' into gingerbread-plus-aosp

* commit '34763928c995a15ee0b9ecfb7c0f4772ef20f2ea':
  add ART for inet connection condition
 2010-09-10 10:06:54 -07:00
Robert Greenwalt
64c9bb57d9 Merge "add ART for inet connection condition" into gingerbread 2010-09-10 09:58:05 -07:00
Jean-Baptiste Queru
57cbf0857f resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aosp 
Change-Id: I3d36a665f93f976824592edf35f6d6a205cc7617
 2010-09-10 09:53:43 -07:00
Shimeng (Simon) Wang
0d1598c927 Merge "Use the default scale for text input." 2010-09-10 09:39:34 -07:00
Joseph Wen
9fbf20b48c am 94db0238: am 219eb7ec: Merge "Fix bug in JNI BitmapFactory" into gingerbread 
Merge commit '94db0238a3b6cba3cbf0e037af74e898a4741204'

* commit '94db0238a3b6cba3cbf0e037af74e898a4741204':
  Fix bug in JNI BitmapFactory
 2010-09-10 02:39:10 -07:00
Joseph Wen
1205c8be1b am 219eb7ec: Merge "Fix bug in JNI BitmapFactory" into gingerbread 
Merge commit '219eb7ec8403ef9b98125f2b58cc27669ae69712' into gingerbread-plus-aosp

* commit '219eb7ec8403ef9b98125f2b58cc27669ae69712':
  Fix bug in JNI BitmapFactory
 2010-09-10 02:35:50 -07:00
Joseph Wen
2e6dedaa6d Merge "Fix bug in JNI BitmapFactory" into gingerbread 2010-09-10 02:32:05 -07:00
Hung-ying Tyan
3d5502e662 am 5f93c39c: am ca3c24db: Merge "SIP: add SipErrorCode for error feedback." into gingerbread 
Merge commit '5f93c39cdb2f75dda805691987ccd4e570f6cb74'

* commit '5f93c39cdb2f75dda805691987ccd4e570f6cb74':
  SIP: add SipErrorCode for error feedback.
 2010-09-10 02:31:05 -07:00
Hung-ying Tyan
1444db6448 am ca3c24db: Merge "SIP: add SipErrorCode for error feedback." into gingerbread 
Merge commit 'ca3c24db3ae4b7a513f1ca76b1e7a3f56a020680' into gingerbread-plus-aosp

* commit 'ca3c24db3ae4b7a513f1ca76b1e7a3f56a020680':
  SIP: add SipErrorCode for error feedback.
 2010-09-10 02:23:04 -07:00
Hung-ying Tyan
0d93a6efbc Merge "SIP: add SipErrorCode for error feedback." into gingerbread 2010-09-10 02:19:22 -07:00
Dianne Hackborn
9e8d35c518 am 8615fdc1: (-s ours) am 506d724c: Merge "DO NOT MERGE. I like\'d ctate\'s change so much I\'m doin it myself!" into gingerbread 
Merge commit '8615fdc15146d27cc2d3a8efbe57f0a425b19efb'

* commit '8615fdc15146d27cc2d3a8efbe57f0a425b19efb':
  DO NOT MERGE.  I like'd ctate's change so much I'm doin it myself!
 2010-09-09 23:17:14 -07:00
Dianne Hackborn
eb7a4298e6 am 506d724c: Merge "DO NOT MERGE. I like\'d ctate\'s change so much I\'m doin it myself!" into gingerbread 
Merge commit '506d724cc356a7ba73995ef2929c65062277c83d' into gingerbread-plus-aosp

* commit '506d724cc356a7ba73995ef2929c65062277c83d':
  DO NOT MERGE.  I like'd ctate's change so much I'm doin it myself!
 2010-09-09 23:14:46 -07:00
Dianne Hackborn
f1481181ed Merge "DO NOT MERGE. I like'd ctate's change so much I'm doin it myself!" into gingerbread 2010-09-09 23:12:24 -07:00