1. e5d98e7 am a9fae13e: am 9ad705ce: am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app li by Scott Main · 13 years ago
  2. aabf4ec am 9ad705ce: am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing by Scott Main · 13 years ago
  3. a421bf7 am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing by Scott Main · 13 years ago
  4. 3829299 am 55208109: am 3e72c93b: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  5. aba282c am 3e72c93b: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  6. 2bac948 Merge "Enhance WPS" by Irfan Sheriff · 13 years ago
  7. 0a6fc12 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  8. cdc3a83 Merge "Fix rotation so orientation changes aren't dropped. Modify test so that rotation animation is entered one final time after rotation completes. This last time causes mUpdateRotation to be set true forcing a test for orientation change. Fixes bug 6109189." by Craig Mautner · 13 years ago
  9. e058458 Merge "Fix flash" by John Reck · 13 years ago
  10. 81f159f Merge "Sync of the NumberPicker attributes with the public Java APIs" by Svetoslav Ganov · 13 years ago
  11. 38193e2 Merge "Sync of the TimePicker attributes with the public Java APIs." by Svetoslav Ganov · 13 years ago
  12. 9f306f1 Merge "Fixing the build for real." by Svetoslav Ganov · 13 years ago
  13. 2b3093e Merge "Fix connect on a network id with zero" by Irfan Sheriff · 13 years ago
  14. e16e043 Merge "Fixing the build" by Svetoslav Ganov · 13 years ago
  15. ae04156 Merge "Sync of the DatePicker attributes with the public Java APIs." by Svetoslav Ganov · 13 years ago
  16. 9bbb5c2 Merge "Fix typos and line length in AudioRecord comments" by Glenn Kasten · 13 years ago
  17. 91fd58c Merge "Adding getter/setter for all public attributes in CalendarView." by Svetoslav Ganov · 13 years ago
  18. 91b9c8e Merge "Fix the bug net.dns1.pid is same as net.dns2.pid" by Robert Greenwalt · 13 years ago
  19. 94083a1 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  20. 25fb205 Merge "Add a displayColor column to view_events" by Alon Albert · 13 years ago
  21. a0c50b5 Merge "Add an API for deleting databases." by Jeff Brown · 13 years ago
  22. b12501d Merge "Adjust WAL checkpoint interval." by Jeff Brown · 13 years ago
  23. e117b14 Merge "Correct GUID errors in audio effect configuration" by Jean-Michel Trivi · 13 years ago
  24. 88c2ba7 Merge "Fixes to DrmConvertedStatus, DrmInfoStatus, and DrmSupportInfo classes" by James Dong · 13 years ago
  25. 00b5eab Merge "Hidden API for setting p2p NFC modes." by Martijn Coenen · 13 years ago
  26. cdbbb51 Merge "Make sure egl context is valid for the onTrimMemory call" by Teng-Hui Zhu · 13 years ago
  27. a5304a0 am 4c7992e9: am d559bc79: am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 by Robert Ly · 13 years ago
  28. 8244fc6 am b962b98b: am 67a15457: am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 by Robert Ly · 13 years ago
  29. 174e348 am d559bc79: am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 by Robert Ly · 13 years ago
  30. 34f58c8 am 67a15457: am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 by Robert Ly · 13 years ago
  31. 4b8c531 am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 by Robert Ly · 13 years ago
  32. b88b349 am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 by Robert Ly · 13 years ago
  33. 81c173f Merge "docs: fixing bug 5942573" into ics-mr1 by Robert Ly · 13 years ago
  34. acf2581 Merge "Quick fix for Monkey NPE." by George Mount · 13 years ago
  35. f737be5 am d4202c9d: am 921e8303: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 by Dianne Hackborn · 13 years ago
  36. 35fbc7c am 5d87d51f: am f65951bf: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 by Dianne Hackborn · 13 years ago
  37. 57d94bc am 921e8303: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 by Dianne Hackborn · 13 years ago
  38. e8f6cdb am f65951bf: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 by Dianne Hackborn · 13 years ago
  39. 1ba5d31 am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 by Dianne Hackborn · 13 years ago
  40. 4afecd7 am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 by Dianne Hackborn · 13 years ago
  41. b534fb5 Merge "Make ResolverActivity update dynamically." into ics-mr1 by Dianne Hackborn · 13 years ago
  42. 0be3fa3 am d9760a81: am 25517fdc: am 637c50db: am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)" by Adam Powell · 13 years ago
  43. 9402543 am 25517fdc: am 637c50db: am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)" by Adam Powell · 13 years ago
  44. 12c1f3f am 637c50db: am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)" by Adam Powell · 13 years ago
  45. 31e1de1 am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)" by Adam Powell · 13 years ago
  46. 06b573e Merge "add more tracing for buffer allocation" by Mathias Agopian · 13 years ago
  47. cba1a9a Merge "add more ATRACE" by Mathias Agopian · 13 years ago
  48. 841cde5 add more ATRACE by Mathias Agopian · 13 years ago
  49. b52cc9c Merge "Separate animation steps into start, step and finish phases. Fixes bug 6089126." by Craig Mautner · 13 years ago
  50. f1cb384 Merge "Whoops forgot this change." by Dianne Hackborn · 13 years ago
  51. 9d25219 Merge "Fix issue where pm would clear preferred apps when updating an app." by Dianne Hackborn · 13 years ago
  52. 0d080ec Merge "Fix 6028595: Fix reboot loop in AccountUnlock due to null callback" by Jim Miller · 13 years ago
  53. 7486a11 Merge "Improve RTL APIs" by Fabrice Di Meglio · 13 years ago
  54. 489380f Merge "Remove stray log" by Romain Guy · 13 years ago
  55. 00c8249 am 8f0c03b7: am 673a66e3: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 by Tsu Chiang Chuang · 13 years ago
  56. 2beecf1 am 6053b195: am bb69bde5: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 by Tsu Chiang Chuang · 13 years ago
  57. 4eb0a74 am 673a66e3: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 by Tsu Chiang Chuang · 13 years ago
  58. 9b070fe am bb69bde5: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 by Tsu Chiang Chuang · 13 years ago
  59. 0f88bfc am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 by Tsu Chiang Chuang · 13 years ago
  60. d3cb1c2 am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 by Tsu Chiang Chuang · 13 years ago
  61. b1b58c7 Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 by Tsu Chiang Chuang · 13 years ago
  62. 011d5e2 Merge "Telephony: Remove SimCard and RuimCard" by Wink Saville · 13 years ago
  63. c1c13af am 37f9360a: am 3c78e101: am 941ff38d: Merge "fix bug 5942522" into ics-mr1 by Robert Ly · 13 years ago
  64. 3d5474e am ca7d7541: am d70eaff4: am 941ff38d: Merge "fix bug 5942522" into ics-mr1 by Robert Ly · 13 years ago
  65. e9658e2 am a2310712: am 9d36dcc0: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 by Robert Ly · 13 years ago
  66. 1928ae8 am b4afb9a8: am 8125b0b4: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 by Robert Ly · 13 years ago
  67. 1b25fd9 am efa49439: am 4f306bec: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  68. cf27421 Merge "Shouldn't catch Throwable in AsyncTask." by Jeff Brown · 13 years ago
  69. ee48a84 Merge "Fix WifiManager async API" by Irfan Sheriff · 13 years ago
  70. 1ef7b6e Merge "Fix dividers for LinearLayout (TabWidget)" by Adam Powell · 13 years ago
  71. e23b452 Merge "Make layoutDirection API public" by Fabrice Di Meglio · 13 years ago
  72. 9011600 Merge "Remove obsolete KeyChain references to USE_CREDENTIALS (2 of 2)" by Brian Carlstrom · 13 years ago
  73. 715f6e8 Merge "Allow webview to delete GL resource in a valid EGL context" by Teng-Hui Zhu · 13 years ago
  74. 4d811ec am 956abc30: am f8e58c8b: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  75. 66b4557 Merge "Remove hacks that worked around issues in OMX components several releases back." by Andreas Huber · 13 years ago
  76. 0921733 am 55fbbce4: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp by Android Git Automerger · 13 years ago
  77. 2013c37 am da0c4a3e: am d12347b2: am eb4f3256: Set the video encoding bit rate for the media recorder stress test. by Yu Shan Emily Lau · 13 years ago
  78. 5d2ae34 am 353b61a8: am 0ddfe24a: am eb4f3256: Set the video encoding bit rate for the media recorder stress test. by Yu Shan Emily Lau · 13 years ago
  79. c8a2180 am f73222a3: am 964955e0: am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources" by Jean-Baptiste Queru · 13 years ago
  80. 24d4e44 am f09c0c7f: am 93920d79: am a66be970: am 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device" by Jean-Baptiste Queru · 13 years ago
  81. 88498d6 am dbc591e2: am c69d6134: am 6ae4fe94: am 9303919d: Merge "Adds documentation for ContentResolver notifyChange()" by Jean-Baptiste Queru · 13 years ago
  82. c41fbc3 am 9de7793b: am 4f906362: am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5 by Jean-Baptiste Queru · 13 years ago
  83. d90b9b8 am 715c78b9: am 225eec8d: am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits" by Jean-Baptiste Queru · 13 years ago
  84. 16782f6 am 4917bc10: am d31da0a6: am fb393f8b: Mark configuration strings as not translatable. by Eric Fischer · 13 years ago
  85. 4d608d7 am b145e363: (-s ours) am ba62da99: am fb393f8b: Mark configuration strings as not translatable. by Eric Fischer · 13 years ago
  86. d712843 Merge "Fix 5797764: fix crash on tablets" by Jim Miller · 13 years ago
  87. 8a5da14 Merge "Fix 5797764: don't hold PowerManager lock when changing native brightness" by Jim Miller · 13 years ago
  88. 768f8c4 Merge "Prevent a 'TODO' from appearing in the JavaDoc" by Steve Block · 13 years ago
  89. a278f46 am 3c78e101: am 941ff38d: Merge "fix bug 5942522" into ics-mr1 by Robert Ly · 13 years ago
  90. ffb9866 am d70eaff4: am 941ff38d: Merge "fix bug 5942522" into ics-mr1 by Robert Ly · 13 years ago
  91. b11d851 am 941ff38d: Merge "fix bug 5942522" into ics-mr1 by Robert Ly · 13 years ago
  92. 2723562 am 941ff38d: Merge "fix bug 5942522" into ics-mr1 by Robert Ly · 13 years ago
  93. 55383fd Merge "fix bug 5942522" into ics-mr1 by Robert Ly · 13 years ago
  94. 47af9e4 am 9d36dcc0: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 by Robert Ly · 13 years ago
  95. 2b53ed6 am 8125b0b4: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 by Robert Ly · 13 years ago
  96. 88e35b8 am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 by Robert Ly · 13 years ago
  97. 84b4488 am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 by Robert Ly · 13 years ago
  98. 671c6de Merge "docs: fix bug 5878445" into ics-mr1 by Robert Ly · 13 years ago
  99. 6bb241d Merge "Instead of hardcoding OMX component names in our code, support" by Andreas Huber · 13 years ago
  100. 4a67f0b Merge "Small tweak to Canvas.drawPath() GL implementation" by Romain Guy · 13 years ago