ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
31,960 Commits 2 Branches 0 Tags 54 MiB
96adfac1f9
Commit Graph

31960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
96adfac1f9 am 9b50c1fc: (-s ours) am b7b877a4: (-s ours) am 0a98226e: Merge 9d76581f from honeycomb. do not merge. 
* commit '9b50c1fcda99fd74fe40b6393d57f9dacc8c7d12':
  Merge 9d76581f from honeycomb. do not merge.
 2011-03-15 12:07:43 -07:00
Xavier Ducrohet
73741561d6 am 20ad9553: (-s ours) am a82a219a: (-s ours) am b243aabd: Merge adaa12cd from honeycomb. do not merge. 
* commit '20ad95532476bad17bbef8d406814b06f3d7fcf1':
  Merge adaa12cd from honeycomb. do not merge.
 2011-03-15 12:07:41 -07:00
Brad Fitzpatrick
5e32eb1b55 am aaae0573: am 403da3a7: am 8d25eab1: Merge "Releasing lock even if exception is thrown." 
* commit 'aaae0573bb537b9de89c0410b9386e8f96c3568b':
  Releasing lock even if exception is thrown.
 2011-03-15 12:07:36 -07:00
Brad Fitzpatrick
16be38f322 am b8c5fe00: am a74887e8: am 56c4c442: Merge "Lazy initialization must be synchronized to avoid parallel instances cretation." 
* commit 'b8c5fe004dce258eeca5fbba1925b9b1f513d650':
  Lazy initialization must be synchronized to avoid parallel instances cretation.
 2011-03-15 12:07:33 -07:00
Brad Fitzpatrick
e2f3082b2e am 36ca1d3a: am 9ac9b285: am b98c8fca: Merge "Removing self-assignment statement." 
* commit '36ca1d3a693f0a416e758bb52801a3381a34a605':
  Removing self-assignment statement.
 2011-03-15 12:07:30 -07:00
Brad Fitzpatrick
b981442d41 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
Xavier Ducrohet
7d449d205c am b7b877a4: (-s ours) am 0a98226e: Merge 9d76581f from honeycomb. do not merge. 
* commit 'b7b877a45f469336703844a928482e6438442567':
  Merge 9d76581f from honeycomb. do not merge.
 2011-03-15 12:05:46 -07:00
Xavier Ducrohet
3c10c7f022 am a82a219a: (-s ours) am b243aabd: Merge adaa12cd from honeycomb. do not merge. 
* commit 'a82a219a7aaee82d790810f6660924604b7a7e81':
  Merge adaa12cd from honeycomb. do not merge.
 2011-03-15 12:05:43 -07:00
Brad Fitzpatrick
ef098e3f2c am 403da3a7: am 8d25eab1: Merge "Releasing lock even if exception is thrown." 
* commit '403da3a79af78920b33448bbc8d91c4b8aebf4a4':
  Releasing lock even if exception is thrown.
 2011-03-15 12:05:40 -07:00
Brad Fitzpatrick
caa8c8088c am a74887e8: am 56c4c442: Merge "Lazy initialization must be synchronized to avoid parallel instances cretation." 
* commit 'a74887e87c720fd100f10b2e69a027c493036e20':
  Lazy initialization must be synchronized to avoid parallel instances cretation.
 2011-03-15 12:05:37 -07:00
Brad Fitzpatrick
f9bb6d0586 am 9ac9b285: am b98c8fca: Merge "Removing self-assignment statement." 
* commit '9ac9b28576834b69561a48a4050e7ad027543bcd':
  Removing self-assignment statement.
 2011-03-15 12:05:33 -07:00
Brad Fitzpatrick
f50ebc0033 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
d17beac1f1 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
0c28c853fd 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
b43920ce4e Merge "Import revised translations." 2011-03-15 12:00:49 -07:00
Brad Fitzpatrick
222c36322b 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
7f0dbabda9 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
47b876d150 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
d516c74c42 resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp 
Change-Id: Ic677e58dcc182908ae1fde33047b3fda013a37c3
 2011-03-15 11:54:46 -07:00
Brad Fitzpatrick
ad2eaedd63 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
f33938da11 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
af66d599b6 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
2882f9ec8d 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
f17316f2d7 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
75fb24f4d1 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
ba82770293 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
64505d4233 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
Xavier Ducrohet
c0ab47832c am 0a98226e: Merge 9d76581f from honeycomb. do not merge. 
* commit '0a98226e3c8cda46786558147a0eb6a56c3370c0':
  Merge 9d76581f from honeycomb. do not merge.
 2011-03-15 11:41:13 -07:00
Xavier Ducrohet
56b53603d9 am b243aabd: Merge adaa12cd from honeycomb. do not merge. 
* commit 'b243aabdaf1ba6fdfc0579c9f949e00d562456ed':
  Merge adaa12cd from honeycomb. do not merge.
 2011-03-15 11:41:10 -07:00
Brad Fitzpatrick
3a74588371 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
08e024a356 am 8d25eab1: Merge "Releasing lock even if exception is thrown." 
* commit '8d25eab10523ac2424dc645dc697126dbadad588':
  Releasing lock even if exception is thrown.
 2011-03-15 11:37:37 -07:00
Brad Fitzpatrick
48f51d8243 am 56c4c442: Merge "Lazy initialization must be synchronized to avoid parallel instances cretation." 
* commit '56c4c442c0309aa91958dee6b6ed2d65db7ba17d':
  Lazy initialization must be synchronized to avoid parallel instances cretation.
 2011-03-15 11:37:32 -07:00
Brad Fitzpatrick
a71e8d2937 am b98c8fca: Merge "Removing self-assignment statement." 
* commit 'b98c8fca954718cb61d6513e623a78f1b0bd0edb':
  Removing self-assignment statement.
 2011-03-15 11:37:29 -07:00
Brad Fitzpatrick
1f604f42e5 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
2cc788c9a6 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
acfbfbc079 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
2f0747bc6e 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
fe95159c8e 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
29c137d125 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
0a81d3e158 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
8e67eefe36 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
a76bec273a 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
16dfc303e2 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
124eb84c5e Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread 2011-03-15 11:29:16 -07:00
Xavier Ducrohet
1d0284b613 Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread 2011-03-15 11:29:07 -07:00
Brad Fitzpatrick
dce27d58b5 Merge "Releasing lock even if exception is thrown." 2011-03-15 11:23:44 -07:00
Brad Fitzpatrick
6c8eb099e4 Merge "Lazy initialization must be synchronized to avoid parallel instances cretation." 2011-03-15 11:22:43 -07:00
Brad Fitzpatrick
3b2122f9a2 Merge "Removing self-assignment statement." 2011-03-15 11:19:23 -07:00
Brad Fitzpatrick
47c8e50c57 Merge "Fixing self-assignment in copying code." 2011-03-15 11:18:18 -07:00
Brad Fitzpatrick
03af2d42a4 Merge "Fixing self-assignment in cloning code." 2011-03-15 11:15:19 -07:00