1. bb09b35 am c3a785cb: (-s ours) am b05fea7d: am e6ef8d0b: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 by Eric Fischer · 15 years ago
  2. 06964ef am b05fea7d: am e6ef8d0b: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 by Eric Fischer · 15 years ago
  3. 9fe4370 am e6ef8d0b: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 by Eric Fischer · 15 years ago
  4. d4c0f4e Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 by Eric Fischer · 15 years ago
  5. 15ff8ea am 782ffe91: am 9c0c5b56: am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files by James Dong · 15 years ago
  6. 247dbd1 am 2c3257b2: am 9940c8b6: am def35f7a: Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1 by Gloria Wang · 15 years ago
  7. b747834 am 9c0c5b56: am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files by James Dong · 15 years ago
  8. 590d597 am 9940c8b6: am def35f7a: Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1 by Gloria Wang · 15 years ago
  9. 892c399 am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files by James Dong · 15 years ago
  10. 95a8679 am def35f7a: Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1 by Gloria Wang · 15 years ago
  11. 3e99aa9 Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1 by Gloria Wang · 15 years ago
  12. 3d8e6ed am 8698c912: am b8332786: am d973bed3: Merge "Removing dead store; it was likely a relict of debuging code." by Brad Fitzpatrick · 15 years ago
  13. 8fa2e62 am b8332786: am d973bed3: Merge "Removing dead store; it was likely a relict of debuging code." by Brad Fitzpatrick · 15 years ago
  14. cb2a197 am 074903a9: am eca7ff02: am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1 by Paul Milovanov · 15 years ago
  15. 892ce1f am eca7ff02: am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1 by Paul Milovanov · 15 years ago
  16. 7c4c1cc am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1 by Paul Milovanov · 15 years ago
  17. c7112b9 Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1 by Paul Milovanov · 15 years ago
  18. 25fd80d am d973bed3: Merge "Removing dead store; it was likely a relict of debuging code." by Brad Fitzpatrick · 15 years ago
  19. 64069d4 Merge "Removing dead store; it was likely a relict of debuging code." by Brad Fitzpatrick · 15 years ago
  20. b82fc40 am 132b23f8: am c97022e7: am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1 by Mike Lockwood · 15 years ago
  21. 7832a85 am c97022e7: am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1 by Mike Lockwood · 15 years ago
  22. ba47878 am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1 by Mike Lockwood · 15 years ago
  23. 973c0ad Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1 by Mike Lockwood · 15 years ago
  24. edb14dc am 1b4890c9: am 45026366: am 8f5cab8b: Merge "Remove logspew." into honeycomb-mr1 by Daniel Sandler · 15 years ago
  25. 8fc90fc am 45026366: am 8f5cab8b: Merge "Remove logspew." into honeycomb-mr1 by Daniel Sandler · 15 years ago
  26. 9abaf18 am 8f5cab8b: Merge "Remove logspew." into honeycomb-mr1 by Daniel Sandler · 15 years ago
  27. 7d96e26 Merge "Remove logspew." into honeycomb-mr1 by Daniel Sandler · 15 years ago
  28. 8024aab am 9cd93f09: am ea775ca3: am f8d1533b: Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1 by Adam Powell · 15 years ago
  29. 8af3fb3 am ea775ca3: am f8d1533b: Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1 by Adam Powell · 15 years ago
  30. 84391e6 am f8d1533b: Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1 by Adam Powell · 15 years ago
  31. c985885 Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1 by Adam Powell · 15 years ago
  32. 2f01f69 am e5feed7e: am 244eb34a: am d98f8aff: Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1 by Jeff Brown · 15 years ago
  33. a67bdc7 am 244eb34a: am d98f8aff: Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1 by Jeff Brown · 15 years ago
  34. cd00ac8 am d98f8aff: Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1 by Jeff Brown · 15 years ago
  35. 8fb4327 Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1 by Jeff Brown · 15 years ago
  36. 939fee8 am e22aa623: am 25594e19: am f40e638e: fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out by Mathias Agopian · 15 years ago
  37. 679c2bc am 25594e19: am f40e638e: fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out by Mathias Agopian · 15 years ago
  38. 9260be0 am f40e638e: fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out by Mathias Agopian · 15 years ago
  39. d0b55c0 fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out by Mathias Agopian · 15 years ago
  40. b290278 am a13640b9: am 7a0949c6: am 7af7e00b: Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1 by Teng-Hui Zhu · 15 years ago
  41. fc3d156 am 7a0949c6: am 7af7e00b: Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1 by Teng-Hui Zhu · 15 years ago
  42. 4fd8d4c am 7af7e00b: Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1 by Teng-Hui Zhu · 15 years ago
  43. d5b7248 Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1 by Teng-Hui Zhu · 15 years ago
  44. 661e08b am 2983bb6a: am 247820c0: am 8e42d39f: Merge "partial inval" into honeycomb-mr1 by Bart Sears · 15 years ago
  45. f3850c0 am 247820c0: am 8e42d39f: Merge "partial inval" into honeycomb-mr1 by Bart Sears · 15 years ago
  46. 0c457ee am 8e42d39f: Merge "partial inval" into honeycomb-mr1 by Bart Sears · 15 years ago
  47. b5ff32a Merge "partial inval" into honeycomb-mr1 by Bart Sears · 15 years ago
  48. 193fc9b am 6ff211e0: am 8f6c5226: am 55a9be3d: Merge "Fix for bug 3434228" into honeycomb-mr1 by Alex Sakhartchouk · 15 years ago
  49. eda6057 am 8f6c5226: am 55a9be3d: Merge "Fix for bug 3434228" into honeycomb-mr1 by Alex Sakhartchouk · 15 years ago
  50. 1165479 am 55a9be3d: Merge "Fix for bug 3434228" into honeycomb-mr1 by Alex Sakhartchouk · 15 years ago
  51. a320ded Merge "Fix for bug 3434228" into honeycomb-mr1 by Alex Sakhartchouk · 15 years ago
  52. ef24f9a am 6decf37c: am afcb65c2: am 296c1616: Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1 by Adam Cohen · 15 years ago
  53. 9a4ac8c am afcb65c2: am 296c1616: Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1 by Adam Cohen · 15 years ago
  54. cfe73d1 am 296c1616: Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1 by Adam Cohen · 15 years ago
  55. e330f4b Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1 by Adam Cohen · 15 years ago
  56. 043e3d4 am 72064c66: am b0204d0a: am c2b91a61: Merge "Modify the GL renderer\'s functor to pass the clip to WebView" into honeycomb-mr1 by Romain Guy · 15 years ago
  57. e5ebb72 am b0204d0a: am c2b91a61: Merge "Modify the GL renderer\'s functor to pass the clip to WebView" into honeycomb-mr1 by Romain Guy · 15 years ago
  58. e7c86bf Merge "Check setName() for null string + typo fixes." by Stephen Hines · 15 years ago
  59. 8311f42 am c2b91a61: Merge "Modify the GL renderer\'s functor to pass the clip to WebView" into honeycomb-mr1 by Romain Guy · 15 years ago
  60. a0f38d2 Merge "Modify the GL renderer's functor to pass the clip to WebView" into honeycomb-mr1 by Romain Guy · 15 years ago
  61. 18c49e7 am 8504423f: (-s ours) am c657fcce: am 20ccaf6c: Import revised translations. DO NOT MERGE by Eric Fischer · 15 years ago
  62. 1dd4a81 am c657fcce: am 20ccaf6c: Import revised translations. DO NOT MERGE by Eric Fischer · 15 years ago
  63. 3ed2e9b am 20ccaf6c: Import revised translations. DO NOT MERGE by Eric Fischer · 15 years ago
  64. 0a0f15b am 0af00ebc: am 797f5b0c: am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into ho by Yu Shan Emily Lau · 15 years ago
  65. 3f4f021 am 797f5b0c: am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1 by Yu Shan Emily Lau · 15 years ago
  66. cf033b3 am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1 by Yu Shan Emily Lau · 15 years ago
  67. b5c21a3 Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1 by Yu Shan Emily Lau · 15 years ago
  68. 49714fc am ce254e86: am 69d05490: am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1 by Rajneesh Chowdury · 15 years ago
  69. a8d32f7 am 69d05490: am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1 by Rajneesh Chowdury · 15 years ago
  70. 8e384bd am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1 by Rajneesh Chowdury · 15 years ago
  71. 7d7723d am 9405d987: am a05a8ac5: am af831a7b: Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1 by Mathias Agopian · 15 years ago
  72. 5c2610e Merge "Don't send the seek-complete notification twice." by Andreas Huber · 15 years ago
  73. aeb686d Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1 by Rajneesh Chowdury · 15 years ago
  74. c33924d am a05a8ac5: am af831a7b: Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1 by Mathias Agopian · 15 years ago
  75. bbcff6a am af831a7b: Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1 by Mathias Agopian · 15 years ago
  76. da155b2 Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1 by Mathias Agopian · 15 years ago
  77. 404b83f Merge "resolved conflicts for merge of 1cbf8493 to master" by James Dong · 15 years ago
  78. e4e5733 resolved conflicts for merge of 1cbf8493 to master by James Dong · 15 years ago
  79. 7ec61f0 Merge "Don't leak JsonReaders in example code." by Jesse Wilson · 15 years ago
  80. a08152f Modify the GL renderer's functor to pass the clip to WebView by Romain Guy · 15 years ago
  81. 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 · 15 years ago
  82. 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 · 15 years ago
  83. 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 · 15 years ago
  84. dbd6745 Merge "Fix a bogus comment on LruCache.hitCount()" by Jesse Wilson · 15 years ago
  85. 566de3a am 0c4f09be: am f2532d16: am 464b690a: Pass firstLayout info to native webview when setting baseLayer. by Shimeng (Simon) Wang · 15 years ago
  86. f391369 am f2532d16: am 464b690a: Pass firstLayout info to native webview when setting baseLayer. by Shimeng (Simon) Wang · 15 years ago
  87. acdd032 am 464b690a: Pass firstLayout info to native webview when setting baseLayer. by Shimeng (Simon) Wang · 15 years ago
  88. 36bdf14 fix [4107131] nvidia driver call takes a very long time by Mathias Agopian · 15 years ago
  89. 29f83cb am 5b7a1bd7: am b0a07f0c: am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1 by Michael Kolb · 15 years ago
  90. 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 · 15 years ago
  91. 06d3183 am b0a07f0c: am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1 by Michael Kolb · 15 years ago
  92. 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 · 15 years ago
  93. a440dbd am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1 by Michael Kolb · 15 years ago
  94. 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 · 15 years ago
  95. d52a4c4 Merge "add comment to deprecated tag" into honeycomb-mr1 by Michael Kolb · 15 years ago
  96. 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 · 15 years ago
  97. 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 · 15 years ago
  98. ae35668 am d799caa9: am 9a0df3c5: am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1 by Michael Kolb · 15 years ago
  99. 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 · 15 years ago
  100. e011307 am 75d62cee: Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1 by Mike Lockwood · 15 years ago