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

31656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
291dc9afa8 am e2e8da7c: am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread 
* commit 'e2e8da7c734b71c4b6b81e51e16ce3f4061f0f07':
  Improve error reporting for issue #3183612
 2011-03-15 15:44:18 -07:00
Mike Lockwood
12e9f39202 am 3c9aa1aa: (-s ours) am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread 
* commit '3c9aa1aa093ff8acc5ec71190a35b9ab04d64fda':
  DO NOT MERGE: Backport more USB accessory changes from honeycomb
 2011-03-15 15:44:13 -07:00
Dianne Hackborn
fdbbb9ae21 am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread 
* commit '7c2e76f0a4daa7e4316e7a85d41d3c391319d955':
  Improve error reporting for issue #3183612
 2011-03-15 14:49:45 -07:00
Mike Lockwood
dd50b8a8bf am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread 
* commit 'b09763209980ff9210cc353f2410598220ec0480':
  DO NOT MERGE: Backport more USB accessory changes from honeycomb
 2011-03-15 14:49:37 -07:00
Dianne Hackborn
9db5a3473f Merge "Improve error reporting for issue #3183612" into gingerbread 2011-03-15 14:40:56 -07:00
Mike Lockwood
79ae55e051 Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread 2011-03-15 14:04:54 -07:00
Kenny Root
98755be6ed am 7ddd62b5: (-s ours) Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1 
* commit '7ddd62b5bedf9065bba00e25aa62f2eae14cf92e':
  Add byte limit in addition to ratio for installs DO NOT MERGE
 2011-03-15 14:03:50 -07:00
Kenny Root
85f811bd47 Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1 2011-03-15 14:01:39 -07:00
Glenn Kasten
a7813f03a1 am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1 
* commit '4528a7db389b4da73207d00ca15b306a111650cc':
  Bug 4016329 do full string comparisons
 2011-03-15 13:46:27 -07:00
Glenn Kasten
ad4c66d8bb Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1 2011-03-15 13:44:58 -07:00
Mike Lockwood
5938ddb594 am 3b7871c2: Merge "USB Manager string clean up:" into honeycomb-mr1 
* commit '3b7871c242bea5834c657c25fbb89c382566f66f':
  USB Manager string clean up:
 2011-03-15 13:42:44 -07:00
Svetoslav Ganov
84387c915a am bdabdda8: Merge "CheckBoxPreferences do not fire accessibility events" into honeycomb-mr1 
* commit 'bdabdda8954a70625368fbfe6bb283a9200bf2f8':
  CheckBoxPreferences do not fire accessibility events
 2011-03-15 13:42:38 -07:00
Mike Lockwood
9169158b3d am afd1c014: Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1 
* commit 'afd1c0143dfa63bd133e3a4163cc9cc4216e3514':
  SqliteDatabase: Fix local reference leak in custom_function_callback()
 2011-03-15 13:42:35 -07:00
Mike Lockwood
a2863eba79 Merge "USB Manager string clean up:" into honeycomb-mr1 2011-03-15 13:34:06 -07:00
Svetoslav Ganov
3bec96dff1 Merge "CheckBoxPreferences do not fire accessibility events" into honeycomb-mr1 2011-03-15 13:23:17 -07:00
Mike Lockwood
b98c4305b5 Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1 2011-03-15 13:20:58 -07:00
Adam Powell
332cedc23d am 1d233d97: Merge "Fix bug 4088936 - Tabs in the action bar don\'t seem to have a fading edge" into honeycomb-mr1 
* commit '1d233d9708e39f5b57b231746df658567b153484':
  Fix bug 4088936 - Tabs in the action bar don't seem to have a fading edge
 2011-03-15 12:51:07 -07:00
Stephen Hines
8e5bf2db18 am c2db0d40: Merge "Make RS Matrix functions threadable." into honeycomb-mr1 
* commit 'c2db0d405b7d4b7654dbd3740cc065802e4c294e':
  Make RS Matrix functions threadable.
 2011-03-15 12:50:57 -07:00
Jamie Gennis
0ce8f1b853 am 00f47af8: Merge "SurfaceTexture: disallow unsupported uses." into honeycomb-mr1 
* commit '00f47af85a98c6dc3b20d04d8ee6b9a327175ab6':
  SurfaceTexture: disallow unsupported uses.
 2011-03-15 12:50:55 -07:00
Romain Guy
57e73fdb0f am a1bd5a5f: Merge "Fix disappearing edges in lists/scrollviews/etc. Bug #4093871" into honeycomb-mr1 
* commit 'a1bd5a5fd7107483290627d942ae2dd1910b57ca':
  Fix disappearing edges in lists/scrollviews/etc. Bug #4093871
 2011-03-15 12:50:50 -07:00
Scott Main
c8d0934059 am 197d7752: am e8f95e7f: docs: update device dashboard 
* commit '197d77528648b7ec3d44ca6ab63e3036669c1bc8':
  docs: update device dashboard
 2011-03-15 12:50:47 -07:00
Amith Yamasani
5da4943df8 am 7e978441: Merge "Use more padding on the sides for SearchView" into honeycomb-mr1 
* commit '7e978441eeed9defb1031cc17c2857cf06cf825a':
  Use more padding on the sides for SearchView
 2011-03-15 12:50:35 -07:00
Adam Powell
c31fd2fdb9 Merge "Fix bug 4088936 - Tabs in the action bar don't seem to have a fading edge" into honeycomb-mr1 2011-03-15 12:06:45 -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
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
Stephen Hines
2cfe828a78 Merge "Make RS Matrix functions threadable." into honeycomb-mr1 2011-03-15 11:52:36 -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
Jamie Gennis
7a4ac6d0ff Merge "SurfaceTexture: disallow unsupported uses." into honeycomb-mr1 2011-03-15 11:39:24 -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