1. e5ea4bf resolved conflicts for merge of caf0496d to jb-mr2-dev-plus-aosp by Kenny Root · 12 years ago
  2. feb5a72 am fb5e6bbd: Merge "fix javadoc build" into jb-mr2-dev by Scott Main · 12 years ago
  3. fb5e6bb Merge "fix javadoc build" into jb-mr2-dev by Scott Main · 12 years ago
  4. e63b060 fix javadoc build by Scott Main · 12 years ago
  5. 168e18d am d7f67d6f: am 80f8c84e: am 0451003f: am c0677691: am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs by Scott Main · 12 years ago
  6. 492c67a am bd573049: Merge "Putting the gesture debugging back in the box." into jb-mr2-dev by Daniel Sandler · 12 years ago
  7. d7f67d6 am 80f8c84e: am 0451003f: am c0677691: am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs by Scott Main · 12 years ago
  8. bd57304 Merge "Putting the gesture debugging back in the box." into jb-mr2-dev by Daniel Sandler · 12 years ago
  9. 80f8c84 am 0451003f: am c0677691: am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs by Scott Main · 12 years ago
  10. 0451003 am c0677691: am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs by Scott Main · 12 years ago
  11. c067769 am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs by Scott Main · 12 years ago
  12. 92fd550 am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs by Scott Main · 12 years ago
  13. 2c5dca4 Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  14. c70e0f5 Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs by Scott Main · 12 years ago
  15. caf0496 Merge "Check outInfo is not null" by Kenny Root · 12 years ago
  16. fc78e60 Check outInfo is not null by Kenny Root · 12 years ago
  17. 42732e1 am 74e56f19: Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-dev by Jean-Michel Trivi · 12 years ago
  18. 74e56f1 Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-dev by Jean-Michel Trivi · 12 years ago
  19. e41c3cd am 7e157f32: Merge "Deprectate WebViewDatabase password methods." into jb-mr2-dev by Ben Murdoch · 12 years ago
  20. 7e157f3 Merge "Deprectate WebViewDatabase password methods." into jb-mr2-dev by Ben Murdoch · 12 years ago
  21. e813a85 am 2de0771d: Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev by Andreas Huber · 12 years ago
  22. baf4a05 am 5c5c3f3a: Merge "Document that MediaPlayer.getDuration() returns an invalid value (-1)" into jb-mr2-dev by Andreas Huber · 12 years ago
  23. 2de0771d Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev by Andreas Huber · 12 years ago
  24. 5c5c3f3 Merge "Document that MediaPlayer.getDuration() returns an invalid value (-1)" into jb-mr2-dev by Andreas Huber · 12 years ago
  25. d39de0b merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  26. c4294ed am 330a9fe3: Merge "Unhide new RS APIs." into jb-mr2-dev by Jason Sams · 12 years ago
  27. 330a9fe Merge "Unhide new RS APIs." into jb-mr2-dev by Jason Sams · 12 years ago
  28. 9157477 Public APIs for media position in RemoteControlClient by Jean-Michel Trivi · 12 years ago
  29. 02d56d9 Unhide new RS APIs. by Jason Sams · 12 years ago
  30. 6064c5c am e1375908: Rename isUserLimited to isLinkedUser by Amith Yamasani · 12 years ago
  31. e137590 Rename isUserLimited to isLinkedUser by Amith Yamasani · 12 years ago
  32. 19c95bc am e188c984: Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev by Amith Yamasani · 12 years ago
  33. e188c98 Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev by Amith Yamasani · 12 years ago
  34. ade20f4 am a068eedd: Revert "Make --non-constant-id generates non final IDs for styleable." by Xavier Ducrohet · 12 years ago
  35. a068eed Revert "Make --non-constant-id generates non final IDs for styleable." by Xavier Ducrohet · 12 years ago
  36. 00c4c67 am 301e95f2: Merge "Add a little more resource load tracing." into jb-mr2-dev by Dianne Hackborn · 12 years ago
  37. 301e95f Merge "Add a little more resource load tracing." into jb-mr2-dev by Dianne Hackborn · 12 years ago
  38. ccbe389 Introducing manifest flag requiredAccountType by Amith Yamasani · 12 years ago
  39. 0acc193 Add a little more resource load tracing. by Dianne Hackborn · 12 years ago
  40. 5141bf8 am 80fccb4d: Merge "There should be a mandatory coder\'s license. Bug #8586560" into jb-mr2-dev by Romain Guy · 12 years ago
  41. 9563701 am 629b1c4f: Merge "Make --non-constant-id generates non final IDs for styleable." into jb-mr2-dev by Xavier Ducrohet · 12 years ago
  42. 80fccb4 Merge "There should be a mandatory coder's license. Bug #8586560" into jb-mr2-dev by Romain Guy · 12 years ago
  43. 629b1c4 Merge "Make --non-constant-id generates non final IDs for styleable." into jb-mr2-dev by Xavier Ducrohet · 12 years ago
  44. 4c87edf am 1763d6f9: Merge "always trigger a re-draw when updating the transparent region hint" into jb-mr2-dev by Mathias Agopian · 12 years ago
  45. 1763d6f Merge "always trigger a re-draw when updating the transparent region hint" into jb-mr2-dev by Mathias Agopian · 12 years ago
  46. d347d51 am 02087754: Merge "Fix race condition and disable call." into jb-mr2-dev by Jaikumar Ganesh · 12 years ago
  47. 0208775 Merge "Fix race condition and disable call." into jb-mr2-dev by Jaikumar Ganesh · 12 years ago
  48. dd03b6d am 26257a09: Merge "Allow for setting test type as a monkey." into jb-mr2-dev by Svetoslav Ganov · 12 years ago
  49. 6407695 am 72ab9b80: Merge "Respect custom view drawing order when dispatching hover events." into jb-mr2-dev by Svetoslav · 12 years ago
  50. 26257a0 Merge "Allow for setting test type as a monkey." into jb-mr2-dev by Svetoslav Ganov · 12 years ago
  51. 72ab9b8 Merge "Respect custom view drawing order when dispatching hover events." into jb-mr2-dev by Svetoslav · 12 years ago
  52. 019895e am 8692685a: Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev by Kenny Root · 12 years ago
  53. 8692685 Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev by Kenny Root · 12 years ago
  54. 18e99d1 am 15fed390: Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev by Dianne Hackborn · 12 years ago
  55. 54e3d384 always trigger a re-draw when updating the transparent region hint by Mathias Agopian · 12 years ago
  56. 0e5e9aa Respect custom view drawing order when dispatching hover events. by Svetoslav · 12 years ago
  57. 15fed39 Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev by Dianne Hackborn · 12 years ago
  58. 4abab93 There should be a mandatory coder's license. Bug #8586560 by Romain Guy · 12 years ago
  59. 543c5dc am efcb252f: Merge "Properly computer gradient textures width" into jb-mr2-dev by Romain Guy · 12 years ago
  60. efcb252 Merge "Properly computer gradient textures width" into jb-mr2-dev by Romain Guy · 12 years ago
  61. 95aeff8 Properly computer gradient textures width by Romain Guy · 12 years ago
  62. 8730f46 Make --non-constant-id generates non final IDs for styleable. by Xavier Ducrohet · 12 years ago
  63. b0511d4 am e107aa43: Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev by Amith Yamasani · 12 years ago
  64. e107aa4 Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev by Amith Yamasani · 12 years ago
  65. d04215c am 0a41431d: Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev by Chet Haase · 12 years ago
  66. 2eeda72 AndroidKeyStore: Add encrypted flag by Kenny Root · 12 years ago
  67. 0a41431 Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev by Chet Haase · 12 years ago
  68. 46bc4eb Rename isUserRestricted to isUserLimited by Amith Yamasani · 12 years ago
  69. e4a92e3 am faaaa223: am 27248105: am 044d08b0: am 7d62462b: am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs) by Scott Main · 12 years ago
  70. faaaa22 am 27248105: am 044d08b0: am 7d62462b: am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs) by Scott Main · 12 years ago
  71. 2724810 am 044d08b0: am 7d62462b: am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs) by Scott Main · 12 years ago
  72. f7be480 Add new resources trace, also trace apk dex loading. by Dianne Hackborn · 12 years ago
  73. 044d08b am 7d62462b: am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs) by Scott Main · 12 years ago
  74. 7d62462 am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs) by Scott Main · 12 years ago
  75. 8ab0f12 am 64d51032: moar doc tags for search suggestions (Design docs) by Scott Main · 12 years ago
  76. b06cc74 am e203384f: Merge "Disconnect from AP when teardown requested." into jb-mr2-dev by Robert Greenwalt · 12 years ago
  77. e203384 Merge "Disconnect from AP when teardown requested." into jb-mr2-dev by Robert Greenwalt · 12 years ago
  78. 82b6de0 am 03499a23: Merge "Fix for bug 8589670: Marking a not called WebChromeClient as deprecated." into jb-mr2-dev by Kristian Monsen · 12 years ago
  79. 03499a2 Merge "Fix for bug 8589670: Marking a not called WebChromeClient as deprecated." into jb-mr2-dev by Kristian Monsen · 12 years ago
  80. a583a5a am dec4bb9e: Merge "Trace ValueAnimator based animations in systrace" into jb-mr2-dev by Romain Guy · 12 years ago
  81. a378bab am 50b68bf8: Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev by Romain Guy · 12 years ago
  82. 64d5103 moar doc tags for search suggestions (Design docs) by Scott Main · 12 years ago
  83. dec4bb9 Merge "Trace ValueAnimator based animations in systrace" into jb-mr2-dev by Romain Guy · 12 years ago
  84. 50b68bf Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev by Romain Guy · 12 years ago
  85. 430742f API and doc cleanup, plus small animation/UI features by Chet Haase · 12 years ago
  86. 9b8abb5a am ce70311b: Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev by Emily Bernier · 12 years ago
  87. ce70311 Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev by Emily Bernier · 12 years ago
  88. 246ad40 am e527d256: am 4a88777e: am 2ad00035: am 6c79bc7e: am bfc4e4eb: am c9762f20: Merge "exclude IAB docs and various SDK docs from search suggestions Also delete several useless files" into jb-mr1.1-docs by Scott Main · 12 years ago
  89. 8fe6220 am d8b52ee6: am 8a18006e: am e54d44b3: am ab23611c: am 816e905a: am 32bd5495: add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478 by Scott Main · 12 years ago
  90. e527d25 am 4a88777e: am 2ad00035: am 6c79bc7e: am bfc4e4eb: am c9762f20: Merge "exclude IAB docs and various SDK docs from search suggestions Also delete several useless files" into jb-mr1.1-docs by Scott Main · 12 years ago
  91. d8b52ee am 8a18006e: am e54d44b3: am ab23611c: am 816e905a: am 32bd5495: add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478 by Scott Main · 12 years ago
  92. 1aa5248 am 6c072401: Merge "Fix for bug 8500202: Right-to-left text not showing in list view" into jb-mr2-dev by Raph Levien · 12 years ago
  93. 4a88777 am 2ad00035: am 6c79bc7e: am bfc4e4eb: am c9762f20: Merge "exclude IAB docs and various SDK docs from search suggestions Also delete several useless files" into jb-mr1.1-docs by Scott Main · 12 years ago
  94. 8a18006 am e54d44b3: am ab23611c: am 816e905a: am 32bd5495: add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478 by Scott Main · 12 years ago
  95. 6c07240 Merge "Fix for bug 8500202: Right-to-left text not showing in list view" into jb-mr2-dev by Raph Levien · 12 years ago
  96. f151a54 am d6b8a035: Merge "Add support for synchronous get()." into jb-mr2-dev by Tim Murray · 12 years ago
  97. 2ad0003 am 6c79bc7e: am bfc4e4eb: am c9762f20: Merge "exclude IAB docs and various SDK docs from search suggestions Also delete several useless files" into jb-mr1.1-docs by Scott Main · 12 years ago
  98. e54d44b am ab23611c: am 816e905a: am 32bd5495: add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478 by Scott Main · 12 years ago
  99. d6b8a03 Merge "Add support for synchronous get()." into jb-mr2-dev by Tim Murray · 12 years ago
  100. 6c79bc7 am bfc4e4eb: am c9762f20: Merge "exclude IAB docs and various SDK docs from search suggestions Also delete several useless files" into jb-mr1.1-docs by Scott Main · 12 years ago