Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_native / e4e5733bee96dd562aa6803af8e11aafdcc30dc5
  1. e4e5733 resolved conflicts for merge of 1cbf8493 to master by James Dong · 14 years ago
  2. 63e2921 am 28fc2037: am fc591762: Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1 by James Dong · 14 years ago
  3. ab37586 am fc591762: Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1 by James Dong · 14 years ago
  4. fa064b9 Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1 by James Dong · 14 years ago
  5. dbd6745 Merge "Fix a bogus comment on LruCache.hitCount()" by Jesse Wilson · 14 years ago
  6. 566de3a am 0c4f09be: am f2532d16: am 464b690a: Pass firstLayout info to native webview when setting baseLayer. by Shimeng (Simon) Wang · 14 years ago
  7. f391369 am f2532d16: am 464b690a: Pass firstLayout info to native webview when setting baseLayer. by Shimeng (Simon) Wang · 14 years ago
  8. acdd032 am 464b690a: Pass firstLayout info to native webview when setting baseLayer. by Shimeng (Simon) Wang · 14 years ago
  9. 29f83cb am 5b7a1bd7: am b0a07f0c: am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1 by Michael Kolb · 14 years ago
  10. e660bd1 am 1a47fc35: (-s ours) am 7532ae7f: am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1 by Andreas Huber · 14 years ago
  11. 06d3183 am b0a07f0c: am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1 by Michael Kolb · 14 years ago
  12. 5360b59 am 7532ae7f: am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1 by Andreas Huber · 14 years ago
  13. a440dbd am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1 by Michael Kolb · 14 years ago
  14. db6b1d7 am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1 by Andreas Huber · 14 years ago
  15. d52a4c4 Merge "add comment to deprecated tag" into honeycomb-mr1 by Michael Kolb · 14 years ago
  16. ecdbcce Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1 by Andreas Huber · 14 years ago
  17. 102da92 am 89de72d8: am 1d8b5a5e: am 75d62cee: Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1 by Mike Lockwood · 14 years ago
  18. ae35668 am d799caa9: am 9a0df3c5: am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1 by Michael Kolb · 14 years ago
  19. d6629f0 am 1d8b5a5e: am 75d62cee: Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1 by Mike Lockwood · 14 years ago
  20. e011307 am 75d62cee: Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1 by Mike Lockwood · 14 years ago
  21. b80cf4b Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1 by Mike Lockwood · 14 years ago
  22. ebed6c3 Merge "Add 3D mode key and others." by Jeff Brown · 14 years ago
  23. 2dbd5c3 am 9a0df3c5: am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1 by Michael Kolb · 14 years ago
  24. 464e14e am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1 by Michael Kolb · 14 years ago
  25. 5d05f43 Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1 by Michael Kolb · 14 years ago
  26. b2511a0 Merge "Fix a race condition when playing an audio-only stream and seeking before starting." by Andreas Huber · 14 years ago
  27. 5aaab9c Add 3D mode key and others. by Jeff Brown · 14 years ago
  28. 081b24a Merge "Pressed state not cleared if view is disabled in long click handler" by Svetoslav Ganov · 14 years ago
  29. f75ad0d am d40e0efb: (-s ours) am d5eb3bbb: am cc571e96: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 by Eric Fischer · 14 years ago
  30. 0c674c7 am d5eb3bbb: am cc571e96: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 by Eric Fischer · 14 years ago
  31. 4459711 am cc571e96: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 by Eric Fischer · 14 years ago
  32. f5ff29a Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 by Eric Fischer · 14 years ago
  33. 8faff5c Merge "Update WakeLock-related docs to mention permissions" by Kenny Root · 14 years ago
  34. 950f11f Merge "Add the field date_sent to keep track of the date a message was sent." by Wei Huang · 14 years ago
  35. 8e4e4d1 am c132f45c: am 2b2aaf2b: am ff51d29a: Merge "USB System UI: Fix string localization problems" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  36. 065fd7f am 2b2aaf2b: am ff51d29a: Merge "USB System UI: Fix string localization problems" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  37. 4dd078c am ff51d29a: Merge "USB System UI: Fix string localization problems" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  38. 923325f Merge "USB System UI: Fix string localization problems" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  39. 38e3450 Merge "Improve ACTION_IMAGE_CAPTURE and ACTION_VIDEO_CAPTURE javadoc." by Wu-cheng Li · 14 years ago
  40. 471b990 am 9bb250bf: am a6c3ace3: am 3913c131: Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1 by Eric Laurent · 14 years ago
  41. 0ca1b0f am f8c4c128: am 0f7d2ec3: am 46fc2517: Merge "Fix performance issue in Launcher Bug #3515248" into honeycomb-mr1 by Romain Guy · 14 years ago
  42. 6509fac am 30d7eb02: am 6ad9cc9a: am 6764ecf8: Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1 by Justin Ho · 14 years ago
  43. 463b756 am 201bc41e: am 750a4a26: am 141505a9: Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1 by Justin Ho · 14 years ago
  44. 5cfbe30 am 89254a11: am e01675cd: am 2d5cbc92: Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1 by Stephen Hines · 14 years ago
  45. 51af855 am a6c3ace3: am 3913c131: Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1 by Eric Laurent · 14 years ago
  46. d8aa852 am 0f7d2ec3: am 46fc2517: Merge "Fix performance issue in Launcher Bug #3515248" into honeycomb-mr1 by Romain Guy · 14 years ago
  47. e8d4ba8 am 6ad9cc9a: am 6764ecf8: Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1 by Justin Ho · 14 years ago
  48. 2e2a687 am 750a4a26: am 141505a9: Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1 by Justin Ho · 14 years ago
  49. fcf616b am e01675cd: am 2d5cbc92: Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1 by Stephen Hines · 14 years ago
  50. ed61c95 am 3913c131: Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1 by Eric Laurent · 14 years ago
  51. 82bf71e am 46fc2517: Merge "Fix performance issue in Launcher Bug #3515248" into honeycomb-mr1 by Romain Guy · 14 years ago
  52. c83eb9f am 6764ecf8: Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1 by Justin Ho · 14 years ago
  53. d7ae582 am 141505a9: Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1 by Justin Ho · 14 years ago
  54. ca92c21 am 2d5cbc92: Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1 by Stephen Hines · 14 years ago
  55. b8a68b8 am 0dd0a805: (-s ours) am a78327da: am acca1600: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 by Eric Fischer · 14 years ago
  56. 2ef180f am a78327da: am acca1600: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 by Eric Fischer · 14 years ago
  57. e0ee4cc am acca1600: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 by Eric Fischer · 14 years ago
  58. 4a650ac am d57440c1: (-s ours) am 29d30cdc: Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1 by Kenny Root · 14 years ago
  59. c88f9ad am 29d30cdc: Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1 by Kenny Root · 14 years ago
  60. 4bda776 Merge "Add CorrectionSpan and APIs to pass a secure CorrectionSpan to TextView" by satok · 14 years ago
  61. bbad640 am cb2d1be9: am a1e4b659: am 9b183a72: Merge "Updated notification asset for DND mode" into honeycomb-mr1 by Justin Ho · 14 years ago
  62. b95cd9d am a1e4b659: am 9b183a72: Merge "Updated notification asset for DND mode" into honeycomb-mr1 by Justin Ho · 14 years ago
  63. 4f635d4 am 9b183a72: Merge "Updated notification asset for DND mode" into honeycomb-mr1 by Justin Ho · 14 years ago
  64. e3d4a68 Merge "Improve VelocityTracker numerical stability." by Jeff Brown · 14 years ago
  65. 1593354 Improve VelocityTracker numerical stability. by Jeff Brown · 14 years ago
  66. d54d836 Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1 by Eric Laurent · 14 years ago
  67. f8fc413 Merge "Fix performance issue in Launcher Bug #3515248" into honeycomb-mr1 by Romain Guy · 14 years ago
  68. e363968 Merge "Add new PreferenceActivity API for settings." by Dianne Hackborn · 14 years ago
  69. 0d88d2b Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1 by Justin Ho · 14 years ago
  70. fbd5784 Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1 by Justin Ho · 14 years ago
  71. f38ea53 Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1 by Stephen Hines · 14 years ago
  72. 4cc0598 am 9b7c1274: am e2e8da7c: am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread by Dianne Hackborn · 14 years ago
  73. 556b19a am a32b5978: (-s ours) am 3c9aa1aa: (-s ours) am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread by Mike Lockwood · 14 years ago
  74. 291dc9a am e2e8da7c: am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread by Dianne Hackborn · 14 years ago
  75. 12e9f39 am 3c9aa1aa: (-s ours) am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread by Mike Lockwood · 14 years ago
  76. d97acec Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 by Eric Fischer · 14 years ago
  77. fdbbb9a am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread by Dianne Hackborn · 14 years ago
  78. dd50b8a am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread by Mike Lockwood · 14 years ago
  79. 86db2b5 Merge "Revise free space checks for package installs" by Kenny Root · 14 years ago
  80. 26d44cb Merge "Updated notification asset for DND mode" into honeycomb-mr1 by Justin Ho · 14 years ago
  81. 9db5a34 Merge "Improve error reporting for issue #3183612" into gingerbread by Dianne Hackborn · 14 years ago
  82. 71ab72b Merge "Bug fixes of DRM framework." by Gloria Wang · 14 years ago
  83. 37bde0d am b3150784: (-s ours) am 7ddd62b5: (-s ours) Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1 by Kenny Root · 14 years ago
  84. 79ae55e Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread by Mike Lockwood · 14 years ago
  85. 98755be am 7ddd62b5: (-s ours) Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1 by Kenny Root · 14 years ago
  86. 85f811b Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1 by Kenny Root · 14 years ago
  87. 77b6f0a am 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1 by Glenn Kasten · 14 years ago
  88. b283845 am c9b82ebb: am 3b7871c2: Merge "USB Manager string clean up:" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  89. 05fd0ed am 3b901c4b: am bdabdda8: Merge "CheckBoxPreferences do not fire accessibility events" into honeycomb-mr1 by Svetoslav Ganov · 14 years ago
  90. 8dbd431 am 6a20784e: am afd1c014: Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  91. a7813f0 am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1 by Glenn Kasten · 14 years ago
  92. ad4c66d Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1 by Glenn Kasten · 14 years ago
  93. 5938ddb am 3b7871c2: Merge "USB Manager string clean up:" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  94. 84387c9 am bdabdda8: Merge "CheckBoxPreferences do not fire accessibility events" into honeycomb-mr1 by Svetoslav Ganov · 14 years ago
  95. 9169158 am afd1c014: Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  96. a2863eb Merge "USB Manager string clean up:" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  97. 3bec96d Merge "CheckBoxPreferences do not fire accessibility events" into honeycomb-mr1 by Svetoslav Ganov · 14 years ago
  98. b98c430 Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  99. 6883bb3 am fbe9ca72: am 1d233d97: Merge "Fix bug 4088936 - Tabs in the action bar don\'t seem to have a fading edge" into honeycomb-mr1 by Adam Powell · 14 years ago
  100. 310a34f am ae2f3b3a: am c2db0d40: Merge "Make RS Matrix functions threadable." into honeycomb-mr1 by Stephen Hines · 14 years ago