drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,459 Commits 1 Branch 0 Tags
Commit Graph

47459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Fitzpatrick
3006f63d5f am b41c37ee: am b01fc9fb: (-s ours) am 8b5345fb: Merge "Fixing self-assignment in copying code." 
* commit 'b41c37eec16d030563829108d8c77a9c14931991':
  Fixing self-assignment in copying code.
 2011-03-15 12:07:27 -07:00
Brad Fitzpatrick
b41c37eec1 am b01fc9fb: (-s ours) am 8b5345fb: Merge "Fixing self-assignment in copying code." 
* commit 'b01fc9fb450df941ae7c072247b67c9be32cd8b8':
  Fixing self-assignment in copying code.
 2011-03-15 12:05:29 -07:00
Xavier Ducrohet
3bc74967ea am e8a00ad2: (-s ours) am f89c3729: (-s ours) am 48a2a5ad: Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread 
* commit 'e8a00ad288e36204cab2ba2407b42525fe2e44e0':
  Merge 6f2fb570 from honeycomb. do not merge.
 2011-03-15 12:01:26 -07:00
Xavier Ducrohet
fff6a88ccc am 9cb1acda: (-s ours) am 405cb570: (-s ours) am 14e1f523: Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread 
* commit '9cb1acda89919a46583444f788f4808fecd5d78d':
  Merge c12b4093 from honeycomb. do not merge.
 2011-03-15 12:01:24 -07:00
Eric Fischer
b2389eaada Merge "Import revised translations." 2011-03-15 12:00:49 -07:00
Brad Fitzpatrick
3a5bfa7b4f am b8796212: resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp 
* commit 'b8796212e3544262193960ade01db6cb2023c8f9':
  Fixing self-assignment in cloning code.
 2011-03-15 11:57:44 -07:00
Xavier Ducrohet
e8a00ad288 am f89c3729: (-s ours) am 48a2a5ad: Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread 
* commit 'f89c37295db5df34c014e0791c976cfa94509068':
  Merge 6f2fb570 from honeycomb. do not merge.
 2011-03-15 11:57:35 -07:00
Xavier Ducrohet
9cb1acda89 am 405cb570: (-s ours) am 14e1f523: Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread 
* commit '405cb57019e0b0b9c2049c2b06537c0f4981fc37':
  Merge c12b4093 from honeycomb. do not merge.
 2011-03-15 11:57:30 -07:00
Brad Fitzpatrick
b8796212e3 resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp 
Change-Id: Ic677e58dcc182908ae1fde33047b3fda013a37c3
 2011-03-15 11:54:46 -07:00
Brad Fitzpatrick
525175c28e am d927e274: am b7d573e9: am 7972e382: Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 
* commit 'd927e2742871dec1cf9a8d861a24d5bcc73c542e':
  Removing repetitive conditional; it simply does nothing except slowing down things.
 2011-03-15 11:44:48 -07:00
Brad Fitzpatrick
d9284580c6 am 6f80f395: am c86ea5e2: am 38c6e31c: Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 
* commit '6f80f395b71cb641b77097e14a1906c7842c9ba6':
  Removing repetitive conditional; it simply does nothing except slowing down things.
 2011-03-15 11:44:46 -07:00
Brad Fitzpatrick
7fa77d8b23 am b81d7f83: am 33dd1bae: am 29d75c9a: Merge "Fixing improper boxing to Integer instead of Long." 
* commit 'b81d7f833890498b6d5db9c16f32564cc88a4042':
  Fixing improper boxing to Integer instead of Long.
 2011-03-15 11:44:43 -07:00
Brad Fitzpatrick
57e680f74d am 8ea79313: am cd7dfcec: (-s ours) am 40b207c1: Merge "Using proper key for removing object from the map." 
* commit '8ea7931357956a5eb03fd5e0cb9cc781e75a471e':
  Using proper key for removing object from the map.
 2011-03-15 11:44:40 -07:00
Brad Fitzpatrick
d927e27428 am b7d573e9: am 7972e382: Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 
* commit 'b7d573e901e07fc249df0bc531cf94c574107556':
  Removing repetitive conditional; it simply does nothing except slowing down things.
 2011-03-15 11:43:08 -07:00
Brad Fitzpatrick
6f80f395b7 am c86ea5e2: am 38c6e31c: Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 
* commit 'c86ea5e260a70f7c48890da702f86466d587904e':
  Removing repetitive conditional; it simply does nothing except slowing down things.
 2011-03-15 11:43:03 -07:00
Brad Fitzpatrick
b81d7f8338 am 33dd1bae: am 29d75c9a: Merge "Fixing improper boxing to Integer instead of Long." 
* commit '33dd1bae6ef16ed1cdc4d9f82f0c608cc7601af6':
  Fixing improper boxing to Integer instead of Long.
 2011-03-15 11:42:58 -07:00
Brad Fitzpatrick
8ea7931357 am cd7dfcec: (-s ours) am 40b207c1: Merge "Using proper key for removing object from the map." 
* commit 'cd7dfcec4b9a059cd67783c8abed72f74c03c4b0':
  Using proper key for removing object from the map.
 2011-03-15 11:42:53 -07:00
Brad Fitzpatrick
69edd9d51b am 64ac744b: am c73c4a36: (-s ours) am b37f7e59: Merge changes I81fc2f90,I5e7fd759 
* commit '64ac744b9fc63be54d8f29b624b657c4b28b3ee1':
  Using proper key for removing from map.
  Removing wrong equals method in comparator.
 2011-03-15 11:39:42 -07:00
Brad Fitzpatrick
b01fc9fb45 am 8b5345fb: Merge "Fixing self-assignment in copying code." 
* commit '8b5345fb3647fee0ec5882537b6a68bb90f4ac1b':
  Fixing self-assignment in copying code.
 2011-03-15 11:37:25 -07:00
Brad Fitzpatrick
64ac744b9f am c73c4a36: (-s ours) am b37f7e59: Merge changes I81fc2f90,I5e7fd759 
* commit 'c73c4a36d2cf5eb3eeeca97caca25c3920dbcfa0':
  Using proper key for removing from map.
  Removing wrong equals method in comparator.
 2011-03-15 11:37:12 -07:00
Xavier Ducrohet
f89c37295d am 48a2a5ad: Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread 
* commit '48a2a5ad1b7c4979b1d7baf6add4bc32148a75ae':
  Merge 6f2fb570 from honeycomb. do not merge.
 2011-03-15 11:37:01 -07:00
Xavier Ducrohet
405cb57019 am 14e1f523: Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread 
* commit '14e1f523c673315cbc3167448ce9252b455d252c':
  Merge c12b4093 from honeycomb. do not merge.
 2011-03-15 11:36:57 -07:00
Brad Fitzpatrick
ceae99835e am 9a01a2f2: Merge "Fixing self-assignment in cloning code." 
* commit '9a01a2f2720632aa9cc230a4ebb0ed7aee762eec':
  Fixing self-assignment in cloning code.
 2011-03-15 11:33:40 -07:00
Brad Fitzpatrick
b7d573e901 am 7972e382: Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 
* commit '7972e382802348e7914c14507426af450aa7e30c':
  Removing repetitive conditional; it simply does nothing except slowing down things.
 2011-03-15 11:33:32 -07:00
Brad Fitzpatrick
c86ea5e260 am 38c6e31c: Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 
* commit '38c6e31c88dec226271e02fbfed675181ae938b7':
  Removing repetitive conditional; it simply does nothing except slowing down things.
 2011-03-15 11:33:28 -07:00
Brad Fitzpatrick
33dd1bae6e am 29d75c9a: Merge "Fixing improper boxing to Integer instead of Long." 
* commit '29d75c9a10a1ff6d60e85a1931d042d3e24d9549':
  Fixing improper boxing to Integer instead of Long.
 2011-03-15 11:30:08 -07:00
Brad Fitzpatrick
cd7dfcec4b am 40b207c1: Merge "Using proper key for removing object from the map." 
* commit '40b207c131e224554e30cde30fe4ee49817432ee':
  Using proper key for removing object from the map.
 2011-03-15 11:30:04 -07:00
Brad Fitzpatrick
c73c4a36d2 am b37f7e59: Merge changes I81fc2f90,I5e7fd759 
* commit 'b37f7e59ee38472bdd3ca5fe66cc847890c862e2':
  Using proper key for removing from map.
  Removing wrong equals method in comparator.
 2011-03-15 11:29:56 -07:00
Xavier Ducrohet
48a2a5ad1b Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread 2011-03-15 11:29:16 -07:00
Xavier Ducrohet
14e1f523c6 Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread 2011-03-15 11:29:07 -07:00
Brad Fitzpatrick
8b5345fb36 Merge "Fixing self-assignment in copying code." 2011-03-15 11:18:18 -07:00
Brad Fitzpatrick
9a01a2f272 Merge "Fixing self-assignment in cloning code." 2011-03-15 11:15:19 -07:00
Brad Fitzpatrick
7972e38280 Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 2011-03-15 11:13:01 -07:00
Brad Fitzpatrick
38c6e31c88 Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 2011-03-15 11:12:15 -07:00
Dianne Hackborn
491d1fef99 am f58f041b: am cffde30f: am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread 
* commit 'f58f041beb8a00db201eb3c8eb801dc1b702253d':
  Add some debug code to try to track down issue 3183612
 2011-03-15 11:06:14 -07:00
Dianne Hackborn
f58f041beb am cffde30f: am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread 
* commit 'cffde30fc10ecdfca53877fbee61525028eb47ba':
  Add some debug code to try to track down issue 3183612
 2011-03-15 11:03:42 -07:00
Brad Fitzpatrick
29d75c9a10 Merge "Fixing improper boxing to Integer instead of Long." 2011-03-15 11:03:29 -07:00
Brad Fitzpatrick
40b207c131 Merge "Using proper key for removing object from the map." 2011-03-15 11:00:51 -07:00
Brad Fitzpatrick
b37f7e59ee Merge changes I81fc2f90,I5e7fd759 
* changes:
  Using proper key for removing from map.
  Removing wrong equals method in comparator.
 2011-03-15 10:56:16 -07:00
Dianne Hackborn
cffde30fc1 am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread 
* commit '44220a56026ead4583a9db96ced5f1113d4b4f07':
  Add some debug code to try to track down issue 3183612
 2011-03-15 10:52:27 -07:00
Robert Greenwalt
79d6ffabd9 am 8d97f87d: am eea577e0: Remove redundant network types. 
* commit '8d97f87d1fc7b67d57d5894915a4451629d98551':
  Remove redundant network types.
 2011-03-15 10:51:23 -07:00
Robert Greenwalt
8d97f87d1f am eea577e0: Remove redundant network types. 
* commit 'eea577e0c41babadf4f07fd9d5e822bd7faa9385':
  Remove redundant network types.
 2011-03-15 10:48:22 -07:00
Jamie Gennis
4a1f8a4e87 am c570ee21: am 41a894ad: am 75597105: Merge "SurfaceTextureClient: Add ISurfaceTexture getter." into honeycomb-mr1 
* commit 'c570ee21e2c2b9802c9d1f58dba024e884b225e6':
  SurfaceTextureClient: Add ISurfaceTexture getter.
 2011-03-15 10:45:01 -07:00
Jamie Gennis
032c5c57d7 am b15ab10c: am 1b7dbf45: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 
* commit 'b15ab10c33058a8a89410085e0b58fd793a0ca54':
 2011-03-15 10:44:59 -07:00
Jamie Gennis
36f3699abd am 73d7036d: am c8bff5d9: ANativeWindow: add query for the concrete type. 
* commit '73d7036da461505af01f2899792f609dc3cdadc9':
  ANativeWindow: add query for the concrete type.
 2011-03-15 10:44:56 -07:00
Robert Greenwalt
eea577e0c4 Remove redundant network types. 
ServiceStateTracker can use the ServiceState values.
bug:4083436

Change-Id: I5b5b72392d9d48adc55731c44417d622930c4bec
 2011-03-15 10:44:01 -07:00
Jamie Gennis
f38d253ccd am ceb7cb14: am 02805a40: Merge "ANativeWindow: add query for the concrete type." into honeycomb-mr1 
* commit 'ceb7cb1460484eda1a3cb9cd271d7caf3a3dcbd1':
  ANativeWindow: add query for the concrete type.
 2011-03-15 10:42:06 -07:00
Jamie Gennis
c570ee21e2 am 41a894ad: am 75597105: Merge "SurfaceTextureClient: Add ISurfaceTexture getter." into honeycomb-mr1 
* commit '41a894ad1379a046b0b7471a33d974c6241a91a9':
  SurfaceTextureClient: Add ISurfaceTexture getter.
 2011-03-15 10:40:26 -07:00
Jamie Gennis
b15ab10c33 am 1b7dbf45: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 
* commit '1b7dbf45f18bea3346a8296cbfd5c1a51cf3e01d':
 2011-03-15 10:40:24 -07:00
Jamie Gennis
73d7036da4 am c8bff5d9: ANativeWindow: add query for the concrete type. 
* commit 'c8bff5d9b72482487e6e62c72236bf14abed2aaf':
  ANativeWindow: add query for the concrete type.
 2011-03-15 10:40:21 -07:00