Commit Graph

32001 Commits

Author SHA1 Message Date
Mike Lockwood
556b19ac04 am a32b5978: (-s ours) am 3c9aa1aa: (-s ours) am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread
* commit 'a32b5978b700abf02e9fe6ae4eb95dfd4c158e4f':
  DO NOT MERGE: Backport more USB accessory changes from honeycomb
2011-03-15 15:47:29 -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
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
Kenny Root
86db2b58a0 Merge "Revise free space checks for package installs" 2011-03-15 14:48:56 -07:00
Gloria Wang
71ab72b0a4 Merge "Bug fixes of DRM framework." 2011-03-15 14:10:30 -07:00
Kenny Root
37bde0dbd3 am b3150784: (-s ours) am 7ddd62b5: (-s ours) Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1
* commit 'b3150784487e7578a004c14da5c00d9bc6eb2fc9':
  Add byte limit in addition to ratio for installs DO NOT MERGE
2011-03-15 14:09:54 -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
77b6f0a9ed am 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1
* commit '7d7dcb5ea891ad4c3252ed832ebd06accc96153d':
  Bug 4016329 do full string comparisons
2011-03-15 13:51:17 -07:00
Mike Lockwood
b28384544b am c9b82ebb: am 3b7871c2: Merge "USB Manager string clean up:" into honeycomb-mr1
* commit 'c9b82ebb97411cf4a8494dc83f57039bb77937c5':
  USB Manager string clean up:
2011-03-15 13:49:14 -07:00
Svetoslav Ganov
05fd0ed107 am 3b901c4b: am bdabdda8: Merge "CheckBoxPreferences do not fire accessibility events" into honeycomb-mr1
* commit '3b901c4b89b2f42c4a212d3f176272f911386e64':
  CheckBoxPreferences do not fire accessibility events
2011-03-15 13:49:12 -07:00
Mike Lockwood
8dbd431b2c am 6a20784e: am afd1c014: Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1
* commit '6a20784e461b0c0b24ccd04acf9509565aec3e70':
  SqliteDatabase: Fix local reference leak in custom_function_callback()
2011-03-15 13:49:09 -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
6883bb3fbb am fbe9ca72: am 1d233d97: Merge "Fix bug 4088936 - Tabs in the action bar don\'t seem to have a fading edge" into honeycomb-mr1
* commit 'fbe9ca72625e9789f334e96b731a6ce0e4153ada':
  Fix bug 4088936 - Tabs in the action bar don't seem to have a fading edge
2011-03-15 13:01:32 -07:00
Stephen Hines
310a34f864 am ae2f3b3a: am c2db0d40: Merge "Make RS Matrix functions threadable." into honeycomb-mr1
* commit 'ae2f3b3a4629629914e6ad5d410594c7dbc856ee':
  Make RS Matrix functions threadable.
2011-03-15 13:01:30 -07:00
Jamie Gennis
9db01a7c1c am 0ea44ac0: am 00f47af8: Merge "SurfaceTexture: disallow unsupported uses." into honeycomb-mr1
* commit '0ea44ac0deb5cc95d60dd512c3a8f6a1bb69f5d1':
  SurfaceTexture: disallow unsupported uses.
2011-03-15 13:01:27 -07:00
Romain Guy
c6687d06aa am 5c84a134: am a1bd5a5f: Merge "Fix disappearing edges in lists/scrollviews/etc. Bug #4093871" into honeycomb-mr1
* commit '5c84a1341b05e96f2c76da7252ed823ec3121102':
  Fix disappearing edges in lists/scrollviews/etc. Bug #4093871
2011-03-15 13:01:24 -07:00
Scott Main
982830c5ea am d0217844: am 197d7752: am e8f95e7f: docs: update device dashboard
* commit 'd0217844320aa5ce620d7fa9e994d78d378006ae':
  docs: update device dashboard
2011-03-15 13:01:20 -07:00
Amith Yamasani
c7167ceca6 am 4a04f11b: am 7e978441: Merge "Use more padding on the sides for SearchView" into honeycomb-mr1
* commit '4a04f11b437d7d92d580c7c8b0b4b54876b6a934':
  Use more padding on the sides for SearchView
2011-03-15 13:01:17 -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
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
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
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