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

20831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
84daca830e Merge "Allow the theme to affect action bar menus" 2010-09-10 15:43:08 -07:00
Gilles Debunne
f78e050ea1 am ddea348d: am e262ab2f: Merge "Changed menu and expandedMenu background color to dark." into gingerbread 
Merge commit 'ddea348daaa0f72fb0aabb4843f9d6af9457efa0'

* commit 'ddea348daaa0f72fb0aabb4843f9d6af9457efa0':
  Changed menu and expandedMenu background color to dark.
 2010-09-10 15:07:33 -07:00
Brad Fitzpatrick
8f2e7d2c76 am 37fc8cc7: am b724d251: Merge "Enable strictmode logging in system_server & add a lock." into gingerbread 
Merge commit '37fc8cc7b87133eddacaeab60cabefaf4a7b9bdd'

* commit '37fc8cc7b87133eddacaeab60cabefaf4a7b9bdd':
  Enable strictmode logging in system_server & add a lock.
 2010-09-10 15:07:20 -07:00
Jesse Wilson
04f0d9da29 am 30f163e4: am 86333015: Merge "Delete AWT from frameworks/base." into gingerbread 
Merge commit '30f163e4d9c4f75c3493200c29f8f333ab3de07b'

* commit '30f163e4d9c4f75c3493200c29f8f333ab3de07b':
  Delete AWT from frameworks/base.
 2010-09-10 15:06:54 -07:00
Joe Onorato
5158363a25 am 38f75b97: (-s ours) am 58300000: This was already deprecated, but not picked up by the tool DO NOT MERGE 
Merge commit '38f75b97d92508633c69eb6461efd353a61dab96'

* commit '38f75b97d92508633c69eb6461efd353a61dab96':
  This was already deprecated, but not picked up by the tool DO NOT MERGE
 2010-09-10 15:06:40 -07:00
Jean-Michel Trivi
d1bfd5a29e Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2010-09-10 15:06:38 -07:00
Nipun Kwatra
2b063a8f85 Merge "Adding hasProfile." 2010-09-10 15:04:17 -07:00
Eric Fischer
a9c0d5051f am e7be8e8f: (-s ours) am b6a007c5: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit 'e7be8e8f6c3db50df8e755033cd110aabd1143df'

* commit 'e7be8e8f6c3db50df8e755033cd110aabd1143df':
  Import revised translations.  DO NOT MERGE
 2010-09-10 15:02:41 -07:00
Brett Chabot
63b892c806 am 0194eeab: am 4940ff85: Update to new ddmlib-prebuilt api. 
Merge commit '0194eeabfe2cef825f3e91144529be6644ef84c0'

* commit '0194eeabfe2cef825f3e91144529be6644ef84c0':
  Update to new ddmlib-prebuilt api.
 2010-09-10 15:02:01 -07:00
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
Gilles Debunne
c7513e6b5d am e262ab2f: Merge "Changed menu and expandedMenu background color to dark." into gingerbread 
Merge commit 'e262ab2f797eeaf9ad200a1b8479f67641c2aebb' into gingerbread-plus-aosp

* commit 'e262ab2f797eeaf9ad200a1b8479f67641c2aebb':
  Changed menu and expandedMenu background color to dark.
 2010-09-10 14:19:50 -07:00
Gilles Debunne
6f4a9a5cc0 Merge "Changed menu and expandedMenu background color to dark." into gingerbread 2010-09-10 14:16:29 -07:00
Brad Fitzpatrick
3d22167858 am b724d251: Merge "Enable strictmode logging in system_server & add a lock." into gingerbread 
Merge commit 'b724d2519a900744a477bd57df6a2f8703c87e72' into gingerbread-plus-aosp

* commit 'b724d2519a900744a477bd57df6a2f8703c87e72':
  Enable strictmode logging in system_server & add a lock.
 2010-09-10 14:08:58 -07:00
Jesse Wilson
47d5f82186 am 86333015: Merge "Delete AWT from frameworks/base." into gingerbread 
Merge commit '863330154e8d42e688ffda02c497f53d8b213a2d' into gingerbread-plus-aosp

* commit '863330154e8d42e688ffda02c497f53d8b213a2d':
  Delete AWT from frameworks/base.
 2010-09-10 14:06:10 -07:00
Brad Fitzpatrick
70b429291e Merge "Enable strictmode logging in system_server & add a lock." into gingerbread 2010-09-10 14:05:57 -07:00
Jesse Wilson
b19eac8c26 Merge "Delete AWT from frameworks/base." into gingerbread 2010-09-10 14:04:01 -07:00
Joe Onorato
38a9779ada am 58300000: This was already deprecated, but not picked up by the tool DO NOT MERGE 
Merge commit '58300000c1867eaf10fbfb91c53d1b86a37f5b47' into gingerbread-plus-aosp

* commit '58300000c1867eaf10fbfb91c53d1b86a37f5b47':
  This was already deprecated, but not picked up by the tool DO NOT MERGE
 2010-09-10 14:03:28 -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
Eric Fischer
c957a94068 am b6a007c5: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit 'b6a007c5cd7bb02250d4dd573ba89367a010a473' into gingerbread-plus-aosp

* commit 'b6a007c5cd7bb02250d4dd573ba89367a010a473':
  Import revised translations.  DO NOT MERGE
 2010-09-10 13:21:26 -07:00
Eric Fischer
fcc41ded9e Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-09-10 13:18:37 -07:00
Brett Chabot
5d2460b6a2 am 4940ff85: Update to new ddmlib-prebuilt api. 
Merge commit '4940ff85d561310d2c122ca6bd7de4d00772b095' into gingerbread-plus-aosp

* commit '4940ff85d561310d2c122ca6bd7de4d00772b095':
  Update to new ddmlib-prebuilt api.
 2010-09-10 13:03:57 -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