1. c58f27a Merge "Fix for bug 4126103. mMessage in DrmInfoEvent is a reference to the message string, so the temporary message created in the plugin was going out of scope and being destructed while the message was being sent. Changed DrmInfoEvent's mMessage to be const String8 instead of const String8&" by Gloria Wang · 14 years ago
  2. 5a0d290 Merge "GLES2Debugger: Make command exchange async to improve performance." by David Li · 14 years ago
  3. 87d31b4 am 6b3c25c8: am 0318d6bf: am 73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 by Teng-Hui Zhu · 14 years ago
  4. 3bc0feb am 0318d6bf: am 73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 by Teng-Hui Zhu · 14 years ago
  5. 3e8fac4 am 73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 by Teng-Hui Zhu · 14 years ago
  6. 691935b Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 by Teng-Hui Zhu · 14 years ago
  7. c32e05d am 47b42991: am a0215953: am 026d6be2: Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1 by Xavier Ducrohet · 14 years ago
  8. a4710e7 am a0215953: am 026d6be2: Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1 by Xavier Ducrohet · 14 years ago
  9. 0eb5f29 am 026d6be2: Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1 by Xavier Ducrohet · 14 years ago
  10. fdebf54 Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1 by Xavier Ducrohet · 14 years ago
  11. bb09b35 am c3a785cb: (-s ours) am b05fea7d: am e6ef8d0b: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 by Eric Fischer · 14 years ago
  12. 06964ef am b05fea7d: am e6ef8d0b: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 by Eric Fischer · 14 years ago
  13. 9fe4370 am e6ef8d0b: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 by Eric Fischer · 14 years ago
  14. d4c0f4e Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 by Eric Fischer · 14 years ago
  15. 15ff8ea am 782ffe91: am 9c0c5b56: am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files by James Dong · 14 years ago
  16. 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 · 14 years ago
  17. b747834 am 9c0c5b56: am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files by James Dong · 14 years ago
  18. 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 · 14 years ago
  19. 892c399 am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files by James Dong · 14 years ago
  20. 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 · 14 years ago
  21. 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 · 14 years ago
  22. 3d8e6ed am 8698c912: am b8332786: am d973bed3: Merge "Removing dead store; it was likely a relict of debuging code." by Brad Fitzpatrick · 14 years ago
  23. 8fa2e62 am b8332786: am d973bed3: Merge "Removing dead store; it was likely a relict of debuging code." by Brad Fitzpatrick · 14 years ago
  24. cb2a197 am 074903a9: am eca7ff02: am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1 by Paul Milovanov · 14 years ago
  25. 892ce1f am eca7ff02: am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1 by Paul Milovanov · 14 years ago
  26. 7c4c1cc am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1 by Paul Milovanov · 14 years ago
  27. c7112b9 Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1 by Paul Milovanov · 14 years ago
  28. 25fd80d am d973bed3: Merge "Removing dead store; it was likely a relict of debuging code." by Brad Fitzpatrick · 14 years ago
  29. 64069d4 Merge "Removing dead store; it was likely a relict of debuging code." by Brad Fitzpatrick · 14 years ago
  30. 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 · 14 years ago
  31. 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 · 14 years ago
  32. ba47878 am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  33. 973c0ad Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  34. edb14dc am 1b4890c9: am 45026366: am 8f5cab8b: Merge "Remove logspew." into honeycomb-mr1 by Daniel Sandler · 14 years ago
  35. 8fc90fc am 45026366: am 8f5cab8b: Merge "Remove logspew." into honeycomb-mr1 by Daniel Sandler · 14 years ago
  36. 9abaf18 am 8f5cab8b: Merge "Remove logspew." into honeycomb-mr1 by Daniel Sandler · 14 years ago
  37. 7d96e26 Merge "Remove logspew." into honeycomb-mr1 by Daniel Sandler · 14 years ago
  38. 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 · 14 years ago
  39. 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 · 14 years ago
  40. 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 · 14 years ago
  41. c985885 Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1 by Adam Powell · 14 years ago
  42. 2f01f69 am e5feed7e: am 244eb34a: am d98f8aff: Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1 by Jeff Brown · 14 years ago
  43. a67bdc7 am 244eb34a: am d98f8aff: Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1 by Jeff Brown · 14 years ago
  44. cd00ac8 am d98f8aff: Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1 by Jeff Brown · 14 years ago
  45. 8fb4327 Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1 by Jeff Brown · 14 years ago
  46. 939fee8 am e22aa623: am 25594e19: am f40e638e: fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out by Mathias Agopian · 14 years ago
  47. 679c2bc am 25594e19: am f40e638e: fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out by Mathias Agopian · 14 years ago
  48. 9260be0 am f40e638e: fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out by Mathias Agopian · 14 years ago
  49. d0b55c0 fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out by Mathias Agopian · 14 years ago
  50. 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 · 14 years ago
  51. fc3d156 am 7a0949c6: am 7af7e00b: Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1 by Teng-Hui Zhu · 14 years ago
  52. 4fd8d4c am 7af7e00b: Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1 by Teng-Hui Zhu · 14 years ago
  53. d5b7248 Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1 by Teng-Hui Zhu · 14 years ago
  54. 661e08b am 2983bb6a: am 247820c0: am 8e42d39f: Merge "partial inval" into honeycomb-mr1 by Bart Sears · 14 years ago
  55. f3850c0 am 247820c0: am 8e42d39f: Merge "partial inval" into honeycomb-mr1 by Bart Sears · 14 years ago
  56. 0c457ee am 8e42d39f: Merge "partial inval" into honeycomb-mr1 by Bart Sears · 14 years ago
  57. b5ff32a Merge "partial inval" into honeycomb-mr1 by Bart Sears · 14 years ago
  58. 193fc9b am 6ff211e0: am 8f6c5226: am 55a9be3d: Merge "Fix for bug 3434228" into honeycomb-mr1 by Alex Sakhartchouk · 14 years ago
  59. eda6057 am 8f6c5226: am 55a9be3d: Merge "Fix for bug 3434228" into honeycomb-mr1 by Alex Sakhartchouk · 14 years ago
  60. 1165479 am 55a9be3d: Merge "Fix for bug 3434228" into honeycomb-mr1 by Alex Sakhartchouk · 14 years ago
  61. a320ded Merge "Fix for bug 3434228" into honeycomb-mr1 by Alex Sakhartchouk · 14 years ago
  62. ef24f9a am 6decf37c: am afcb65c2: am 296c1616: Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1 by Adam Cohen · 14 years ago
  63. 9a4ac8c am afcb65c2: am 296c1616: Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1 by Adam Cohen · 14 years ago
  64. cfe73d1 am 296c1616: Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1 by Adam Cohen · 14 years ago
  65. e330f4b Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1 by Adam Cohen · 14 years ago
  66. 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 · 14 years ago
  67. e5ebb72 am b0204d0a: am c2b91a61: Merge "Modify the GL renderer\'s functor to pass the clip to WebView" into honeycomb-mr1 by Romain Guy · 14 years ago
  68. e7c86bf Merge "Check setName() for null string + typo fixes." by Stephen Hines · 14 years ago
  69. 8311f42 am c2b91a61: Merge "Modify the GL renderer\'s functor to pass the clip to WebView" into honeycomb-mr1 by Romain Guy · 14 years ago
  70. a0f38d2 Merge "Modify the GL renderer's functor to pass the clip to WebView" into honeycomb-mr1 by Romain Guy · 14 years ago
  71. 18c49e7 am 8504423f: (-s ours) am c657fcce: am 20ccaf6c: Import revised translations. DO NOT MERGE by Eric Fischer · 14 years ago
  72. 1dd4a81 am c657fcce: am 20ccaf6c: Import revised translations. DO NOT MERGE by Eric Fischer · 14 years ago
  73. 3ed2e9b am 20ccaf6c: Import revised translations. DO NOT MERGE by Eric Fischer · 14 years ago
  74. 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 · 14 years ago
  75. 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 · 14 years ago
  76. 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 · 14 years ago
  77. 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 · 14 years ago
  78. 49714fc am ce254e86: am 69d05490: am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1 by Rajneesh Chowdury · 14 years ago
  79. a8d32f7 am 69d05490: am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1 by Rajneesh Chowdury · 14 years ago
  80. 8e384bd am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1 by Rajneesh Chowdury · 14 years ago
  81. 7d7723d am 9405d987: am a05a8ac5: am af831a7b: Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1 by Mathias Agopian · 14 years ago
  82. 5c2610e Merge "Don't send the seek-complete notification twice." by Andreas Huber · 14 years ago
  83. aeb686d Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1 by Rajneesh Chowdury · 14 years ago
  84. c33924d am a05a8ac5: am af831a7b: Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1 by Mathias Agopian · 14 years ago
  85. bbcff6a am af831a7b: Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1 by Mathias Agopian · 14 years ago
  86. da155b2 Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1 by Mathias Agopian · 14 years ago
  87. 404b83f Merge "resolved conflicts for merge of 1cbf8493 to master" by James Dong · 14 years ago
  88. e4e5733 resolved conflicts for merge of 1cbf8493 to master by James Dong · 14 years ago
  89. 7ec61f0 Merge "Don't leak JsonReaders in example code." by Jesse Wilson · 14 years ago
  90. a08152f Modify the GL renderer's functor to pass the clip to WebView by Romain Guy · 14 years ago
  91. 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
  92. 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
  93. 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
  94. dbd6745 Merge "Fix a bogus comment on LruCache.hitCount()" by Jesse Wilson · 14 years ago
  95. 566de3a am 0c4f09be: am f2532d16: am 464b690a: Pass firstLayout info to native webview when setting baseLayer. by Shimeng (Simon) Wang · 14 years ago
  96. f391369 am f2532d16: am 464b690a: Pass firstLayout info to native webview when setting baseLayer. by Shimeng (Simon) Wang · 14 years ago
  97. acdd032 am 464b690a: Pass firstLayout info to native webview when setting baseLayer. by Shimeng (Simon) Wang · 14 years ago
  98. 36bdf14 fix [4107131] nvidia driver call takes a very long time by Mathias Agopian · 14 years ago
  99. 29f83cb am 5b7a1bd7: am b0a07f0c: am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1 by Michael Kolb · 14 years ago
  100. 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