ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
18,264 Commits 2 Branches 0 Tags 54 MiB
b68a497479
Commit Graph

18264 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
aa8831d263 am 36edb202: Merge "Make DRM libraries optional" 
Merge commit '36edb2028acf9f876a288a49a66bc749b28e64c1' into gingerbread-plus-aosp

* commit '36edb2028acf9f876a288a49a66bc749b28e64c1':
  Make DRM libraries optional
 2010-09-12 08:57:07 -07:00
Romain Guy
6b6f26013e am 89e05fd5: Merge "Fix the layouting of the checkbox." 
Merge commit '89e05fd560e3347070a55260b7aaec3db5647442' into gingerbread-plus-aosp

* commit '89e05fd560e3347070a55260b7aaec3db5647442':
  Fix the layouting of the checkbox.
 2010-09-12 08:44:37 -07:00
Jean-Baptiste Queru
2e084394ae Merge "Make DRM libraries optional" 2010-09-12 08:42:48 -07:00
Jean-Baptiste Queru
935dc55ef6 resolved conflicts for merge of 01937f63 to gingerbread-plus-aosp 
Change-Id: If4e427d87538477c90f43be7a9733adb8da1c617
 2010-09-12 08:35:04 -07:00
Romain Guy
c3d40e5b94 Merge "Fix the layouting of the checkbox." 2010-09-11 14:06:07 -07:00
Romain Guy
1cca244dfe Merge "Memory leak in TextKeyListener." 2010-09-11 14:03:11 -07:00
Jean-Baptiste Queru
5b792a2bd8 am ca6de93a: Merge "Fix number counter will keep going after window losed focus." 
Merge commit 'ca6de93a9d2f11a18187d9fcd54303813c06094a' into gingerbread-plus-aosp

* commit 'ca6de93a9d2f11a18187d9fcd54303813c06094a':
  Fix number counter will keep going after window losed focus.
 2010-09-10 16:39:35 -07:00
Jean-Baptiste Queru
d7faa10feb Merge "Fix number counter will keep going after window losed focus." 2010-09-10 16:13:13 -07:00
Jaikumar Ganesh
ed35c68ca1 am e442fb6c: Merge "Register ServiceStateChanged to CallManager." into gingerbread 
Merge commit 'e442fb6c9215fc6329522915805a9582ec2c3323' into gingerbread-plus-aosp

* commit 'e442fb6c9215fc6329522915805a9582ec2c3323':
  Register ServiceStateChanged to CallManager.
 2010-09-10 16:01:19 -07:00
Jaikumar Ganesh
8dd3d8442f Merge "Register ServiceStateChanged to CallManager." into gingerbread 2010-09-10 15:54:19 -07:00
Jean-Baptiste Queru
d60e3f4272 am 962e4826: Merge "Allow two SurfaceViews inbetween the app and the wallpaper." 
Merge commit '962e482606e3f8f8c0b8e540888eaef56a1c8603' into gingerbread-plus-aosp

* commit '962e482606e3f8f8c0b8e540888eaef56a1c8603':
  Allow two SurfaceViews inbetween the app and the wallpaper.
 2010-09-10 15:47:34 -07:00
Jean-Baptiste Queru
adf78d86d7 am 7c65585f: Merge "Make sure OutOfMemoryError is handled by WallpaperManager" 
Merge commit '7c65585feb761a3e00bb2b8a468d43f70a8c3cdc' into gingerbread-plus-aosp

* commit '7c65585feb761a3e00bb2b8a468d43f70a8c3cdc':
  Make sure OutOfMemoryError is handled by WallpaperManager
 2010-09-10 15:47:27 -07:00
Jean-Baptiste Queru
a859dedd64 Merge "Allow two SurfaceViews inbetween the app and the wallpaper." 2010-09-10 14:36:21 -07:00
Jean-Baptiste Queru
e5cc71dab6 Merge "Make sure OutOfMemoryError is handled by WallpaperManager" 2010-09-10 14:25:14 -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
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
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
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
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
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
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
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