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

20950 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Dianne Hackborn
4181bd66fc am 510951e9: am a8512a71: Always set the scheduling group when starting a new thread. 
Merge commit '510951e98bdb861130f38c087956cd05e0b41dcd'

* commit '510951e98bdb861130f38c087956cd05e0b41dcd':
  Always set the scheduling group when starting a new thread.
 2010-09-09 23:11:22 -07:00
Dianne Hackborn
98805c8f6d resolved conflicts for merge of 62d005ec to master 
Change-Id: I552d7adffe70a2bd94113ffb70cdc3e625fca0bd
 2010-09-09 23:06:27 -07:00
Dianne Hackborn
06c725e551 am a8512a71: Always set the scheduling group when starting a new thread. 
Merge commit 'a8512a71d3c2e3e67bbccf11251ed594d66f1f25' into gingerbread-plus-aosp

* commit 'a8512a71d3c2e3e67bbccf11251ed594d66f1f25':
  Always set the scheduling group when starting a new thread.
 2010-09-09 23:05:42 -07:00
Dianne Hackborn
9c82c48d52 Always set the scheduling group when starting a new thread. 
Change-Id: Ia33acf13fc3752707f3819928c36315e223fa1bd
 2010-09-09 22:12:25 -07:00
Dianne Hackborn
903c235897 am 033b381b: am 7f07f842: Merge "Fix doc of fullScreenIntent." into gingerbread 
Merge commit '033b381b4c91aff4bf76481d0b37fb5f39b50ec2'

* commit '033b381b4c91aff4bf76481d0b37fb5f39b50ec2':
  Fix doc of fullScreenIntent.
 2010-09-09 21:39:22 -07:00
Dianne Hackborn
f1a54de9b1 am 195dc210: am a4ce31f5: Merge "Small fixes to battery stats." into gingerbread 
Merge commit '195dc210cb59ba3f660e31a95334fc3fa4d3ad2c'

* commit '195dc210cb59ba3f660e31a95334fc3fa4d3ad2c':
  Small fixes to battery stats.
 2010-09-09 21:39:13 -07:00
Dianne Hackborn
87005bc57f am a7d868d4: Merge "Add toast when an app intercepts the launch of another app." into gingerbread 
Merge commit 'a7d868d4f99dfaf85e13498210aecf1ad8efd859' into gingerbread-plus-aosp

* commit 'a7d868d4f99dfaf85e13498210aecf1ad8efd859':
  Add toast when an app intercepts the launch of another app.
 2010-09-09 21:34:44 -07:00
Dianne Hackborn
ca5b069671 am 7f07f842: Merge "Fix doc of fullScreenIntent." into gingerbread 
Merge commit '7f07f842c9c375648b52de5d8a84c080e9394d71' into gingerbread-plus-aosp

* commit '7f07f842c9c375648b52de5d8a84c080e9394d71':
  Fix doc of fullScreenIntent.
 2010-09-09 21:34:38 -07:00
Dianne Hackborn
4b9adfdb29 am a4ce31f5: Merge "Small fixes to battery stats." into gingerbread 
Merge commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2' into gingerbread-plus-aosp

* commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2':
  Small fixes to battery stats.
 2010-09-09 21:34:33 -07:00
Dianne Hackborn
ad70b5ab4b Merge "Add toast when an app intercepts the launch of another app." into gingerbread 2010-09-09 21:31:34 -07:00
Dianne Hackborn
a632141971 Merge "Fix doc of fullScreenIntent." into gingerbread 2010-09-09 21:31:08 -07:00
Dianne Hackborn
faa2348d30 Merge "Small fixes to battery stats." into gingerbread 2010-09-09 21:30:52 -07:00