Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / d202ef9380fe6c7b4227d7480b2f05860261821c
  1. d202ef9 Merge "Use uint32_t for sample rate" by Glenn Kasten · 13 years ago
  2. 5464555 resolved conflicts for merge of 09de4dad to master by Kenny Root · 13 years ago
  3. 09de4da am e4163e96: Merge "Switch keystore to binder" by Kenny Root · 13 years ago
  4. fff3e65 am 13e510df: am d654f19d: am ca22aee8: am 8680f8ff: Merge "docs: add warning for adt bundle on 32-bit os" into jb-mr1-dev by Scott Main · 13 years ago
  5. 13e510d am d654f19d: am ca22aee8: am 8680f8ff: Merge "docs: add warning for adt bundle on 32-bit os" into jb-mr1-dev by Scott Main · 13 years ago
  6. d654f19 am ca22aee8: am 8680f8ff: Merge "docs: add warning for adt bundle on 32-bit os" into jb-mr1-dev by Scott Main · 13 years ago
  7. ca22aee8 am 8680f8ff: Merge "docs: add warning for adt bundle on 32-bit os" into jb-mr1-dev by Scott Main · 13 years ago
  8. 8680f8f Merge "docs: add warning for adt bundle on 32-bit os" into jb-mr1-dev by Scott Main · 13 years ago
  9. 226fe97 docs: add warning for adt bundle on 32-bit os by Scott Main · 13 years ago
  10. e4163e9 Merge "Switch keystore to binder" by Kenny Root · 13 years ago
  11. 85fbc87 Use uint32_t for sample rate by Glenn Kasten · 13 years ago
  12. 798f1a8 am c8b912aa: am 88337ac8: am 75819a9c: Merge "Resolve LocationManager + ActivityManager conflict" into jb-mr1.1-dev by Victoria Lease · 13 years ago
  13. c8b912a am 88337ac8: am 75819a9c: Merge "Resolve LocationManager + ActivityManager conflict" into jb-mr1.1-dev by Victoria Lease · 13 years ago
  14. 88337ac am 75819a9c: Merge "Resolve LocationManager + ActivityManager conflict" into jb-mr1.1-dev by Victoria Lease · 13 years ago
  15. 75819a9 Merge "Resolve LocationManager + ActivityManager conflict" into jb-mr1.1-dev by Victoria Lease · 13 years ago
  16. 9ffbf11 Merge "Add method name to curl output" by Maurice Chu · 13 years ago
  17. 05b5ffb am 8578c517: am 1716ecf4: am f4ad0192: am 73b1f68e: Merge "docs: Updated uiautomator API docs to reflect correct API level. bug: 7538348" into jb-mr1-dev by Quddus Chong · 13 years ago
  18. 8578c51 am 1716ecf4: am f4ad0192: am 73b1f68e: Merge "docs: Updated uiautomator API docs to reflect correct API level. bug: 7538348" into jb-mr1-dev by Quddus Chong · 13 years ago
  19. 1716ecf am f4ad0192: am 73b1f68e: Merge "docs: Updated uiautomator API docs to reflect correct API level. bug: 7538348" into jb-mr1-dev by Quddus Chong · 13 years ago
  20. f4ad019 am 73b1f68e: Merge "docs: Updated uiautomator API docs to reflect correct API level. bug: 7538348" into jb-mr1-dev by Quddus Chong · 13 years ago
  21. 73b1f68 Merge "docs: Updated uiautomator API docs to reflect correct API level. bug: 7538348" into jb-mr1-dev by Quddus Chong · 13 years ago
  22. 167ecf8 am b8d05c7a: (-s ours) Reconcile with jb-mr1.1-release - do not merge by The Android Open Source Project · 13 years ago
  23. b8d05c7 Reconcile with jb-mr1.1-release - do not merge by The Android Open Source Project · 13 years ago
  24. 77c2655 Add method name to curl output by Maurice Chu · 13 years ago
  25. 8fcab20 docs: Updated uiautomator API docs to reflect correct API level. bug: 7538348 by Quddus Chong · 13 years ago
  26. bb89702 am b680a11b: am e68d8ac1: am 8aa3db48: am 6ed48015: Merge "docs: Update Nexus 10 device frames for darker, more accurate bezel rendering." into jb-mr1-dev by Roman Nurik · 13 years ago
  27. b680a11 am e68d8ac1: am 8aa3db48: am 6ed48015: Merge "docs: Update Nexus 10 device frames for darker, more accurate bezel rendering." into jb-mr1-dev by Roman Nurik · 13 years ago
  28. e68d8ac am 8aa3db48: am 6ed48015: Merge "docs: Update Nexus 10 device frames for darker, more accurate bezel rendering." into jb-mr1-dev by Roman Nurik · 13 years ago
  29. 8aa3db4 am 6ed48015: Merge "docs: Update Nexus 10 device frames for darker, more accurate bezel rendering." into jb-mr1-dev by Roman Nurik · 13 years ago
  30. 6ed4801 Merge "docs: Update Nexus 10 device frames for darker, more accurate bezel rendering." into jb-mr1-dev by Roman Nurik · 13 years ago
  31. 5ca045e merge in jb-mr1.1-release history after reset to jb-mr1.1-dev by The Android Automerger · 13 years ago
  32. 2a45c15 docs: Update Nexus 10 device frames for darker, more accurate bezel rendering. by Roman Nurik · 13 years ago
  33. f7f2357 am 35de4831: am d1e8f467: am 99a86d06: Clarify that MediaFormat.KEY_IS_ADTS only applies to decoding AAC audio content by Andreas Huber · 13 years ago
  34. 9a9f874 am e2a2fe4e: am be37b5fa: Merge "Free resources in correct order in ResStringPool::uninit" by Kenny Root · 13 years ago
  35. dbdcebd resolved conflicts for merge of eacbc280 to master by Kenny Root · 13 years ago
  36. 35de483 am d1e8f467: am 99a86d06: Clarify that MediaFormat.KEY_IS_ADTS only applies to decoding AAC audio content by Andreas Huber · 13 years ago
  37. d1e8f46 am 99a86d06: Clarify that MediaFormat.KEY_IS_ADTS only applies to decoding AAC audio content by Andreas Huber · 13 years ago
  38. e2a2fe4 am be37b5fa: Merge "Free resources in correct order in ResStringPool::uninit" by Kenny Root · 13 years ago
  39. eacbc28 am 87ed0a10: Merge "Bug fix on installd with SELinux enabled kernel." by Kenny Root · 13 years ago
  40. be37b5f Merge "Free resources in correct order in ResStringPool::uninit" by Kenny Root · 13 years ago
  41. 99a86d0 Clarify that MediaFormat.KEY_IS_ADTS only applies to decoding AAC audio content by Andreas Huber · 13 years ago
  42. 6b77645 Switch keystore to binder by Kenny Root · 13 years ago
  43. 87ed0a10 Merge "Bug fix on installd with SELinux enabled kernel." by Kenny Root · 13 years ago
  44. 2e59369d Bug fix on installd with SELinux enabled kernel. by rpcraig · 13 years ago
  45. 61ecb02 Resolve LocationManager + ActivityManager conflict by Victoria Lease · 13 years ago
  46. 74e6489 am 9ae6845a: am 27b587b6: am faa38a08: am 4422596d: am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs by Joe Malin · 13 years ago
  47. 9ae6845 am 27b587b6: am faa38a08: am 4422596d: am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs by Joe Malin · 13 years ago
  48. 27b587b am faa38a08: am 4422596d: am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs by Joe Malin · 13 years ago
  49. faa38a08 am 4422596d: am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs by Joe Malin · 13 years ago
  50. 4422596 am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs by Joe Malin · 13 years ago
  51. ce37f1d am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs by Joe Malin · 13 years ago
  52. 4979a0b am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs by Joe Malin · 13 years ago
  53. 5f32d33 Merge "Notification.java javadoc: addAction" into jb-dev-docs by Joe Malin · 13 years ago
  54. bd2a4d6 am 84ee173d: am f5b07806: am e05d4de5: am 9b703463: Merge "docs: Update platform version page with 4.2 release" into jb-mr1-dev by Joe Fernandez · 13 years ago
  55. 84ee173 am f5b07806: am e05d4de5: am 9b703463: Merge "docs: Update platform version page with 4.2 release" into jb-mr1-dev by Joe Fernandez · 13 years ago
  56. f5b0780 am e05d4de5: am 9b703463: Merge "docs: Update platform version page with 4.2 release" into jb-mr1-dev by Joe Fernandez · 13 years ago
  57. e05d4de am 9b703463: Merge "docs: Update platform version page with 4.2 release" into jb-mr1-dev by Joe Fernandez · 13 years ago
  58. 9b70346 Merge "docs: Update platform version page with 4.2 release" into jb-mr1-dev by Joe Fernandez · 13 years ago
  59. 63f316f Merge "Java RS latency benchmark." by Tim Murray · 13 years ago
  60. 3bdf4b6 docs: Update platform version page with 4.2 release by Joe Fernandez · 13 years ago
  61. 085c47c am dda54fb6: am f88e08d3: am 17a3f233: am f20b146f: Merge "docs: add ndk tos wall" into jb-mr1-dev by Scott Main · 13 years ago
  62. dda54fb am f88e08d3: am 17a3f233: am f20b146f: Merge "docs: add ndk tos wall" into jb-mr1-dev by Scott Main · 13 years ago
  63. f88e08d am 17a3f233: am f20b146f: Merge "docs: add ndk tos wall" into jb-mr1-dev by Scott Main · 13 years ago
  64. 17a3f23 am f20b146f: Merge "docs: add ndk tos wall" into jb-mr1-dev by Scott Main · 13 years ago
  65. f20b146 Merge "docs: add ndk tos wall" into jb-mr1-dev by Scott Main · 13 years ago
  66. 7a12433 am bb67d486: am a97f5b8c: am 9d82d324: Merge "Fix bug #7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev by Fabrice Di Meglio · 13 years ago
  67. 66e642b docs: add ndk tos wall by Scott Main · 13 years ago
  68. 7f1c021 am 75386446: am 81b74a61: am c1d5db79: Merge "Add xxhdpi version of default activity icon" into jb-mr1.1-dev by Michael Jurka · 13 years ago
  69. bb67d48 am a97f5b8c: am 9d82d324: Merge "Fix bug #7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev by Fabrice Di Meglio · 13 years ago
  70. a97f5b8 am 9d82d324: Merge "Fix bug #7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev by Fabrice Di Meglio · 13 years ago
  71. 9d82d32 Merge "Fix bug #7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev by Fabrice Di Meglio · 13 years ago
  72. c1374e8 Fix build by Marco Nelissen · 13 years ago
  73. 7538644 am 81b74a61: am c1d5db79: Merge "Add xxhdpi version of default activity icon" into jb-mr1.1-dev by Michael Jurka · 13 years ago
  74. cccef47 Merge "Make VideoView/MediaController behave better" by Marco Nelissen · 13 years ago
  75. 81b74a6 am c1d5db79: Merge "Add xxhdpi version of default activity icon" into jb-mr1.1-dev by Michael Jurka · 13 years ago
  76. c1d5db7 Merge "Add xxhdpi version of default activity icon" into jb-mr1.1-dev by Michael Jurka · 13 years ago
  77. 0f32fdc am 50acd731: am 67a3fb6f: am c10914ca: Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev by Craig Mautner · 13 years ago
  78. 50acd73 am 67a3fb6f: am c10914ca: Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev by Craig Mautner · 13 years ago
  79. 67a3fb6 am c10914ca: Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev by Craig Mautner · 13 years ago
  80. c10914c Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev by Craig Mautner · 13 years ago
  81. d305b44 am 8a96ab8f: am 9d5e78bf: am ed41bc22: am c178ebe7: Merge "Doc change: update image for landing page." into jb-mr1-dev by Dirk Dougherty · 13 years ago
  82. 8a96ab8 am 9d5e78bf: am ed41bc22: am c178ebe7: Merge "Doc change: update image for landing page." into jb-mr1-dev by Dirk Dougherty · 13 years ago
  83. 9d5e78b am ed41bc22: am c178ebe7: Merge "Doc change: update image for landing page." into jb-mr1-dev by Dirk Dougherty · 13 years ago
  84. ed41bc2 am c178ebe7: Merge "Doc change: update image for landing page." into jb-mr1-dev by Dirk Dougherty · 13 years ago
  85. c178ebe7 Merge "Doc change: update image for landing page." into jb-mr1-dev by Dirk Dougherty · 13 years ago
  86. 9dfa4a7 am b2ff3738: am 03f214b1: am a9e60898: am bd2b5313: Merge "docs: edits" into jb-mr1-dev by Scott Main · 13 years ago
  87. b5e15ca Doc change: update image for landing page. by Dirk Dougherty · 13 years ago
  88. b2ff373 am 03f214b1: am a9e60898: am bd2b5313: Merge "docs: edits" into jb-mr1-dev by Scott Main · 13 years ago
  89. 03f214b am a9e60898: am bd2b5313: Merge "docs: edits" into jb-mr1-dev by Scott Main · 13 years ago
  90. a9e6089 am bd2b5313: Merge "docs: edits" into jb-mr1-dev by Scott Main · 13 years ago
  91. bd2b531 Merge "docs: edits" into jb-mr1-dev by Scott Main · 13 years ago
  92. ca211c7 docs: edits by Scott Main · 13 years ago
  93. d49e9c3 Merge "Import translations. DO NOT MERGE" by Baligh Uddin · 13 years ago
  94. 06b8a16 am 4ec56764: (-s ours) am 5b2a59d8: am 9885af05: am 9508e31d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev by Baligh Uddin · 13 years ago
  95. 4ec5676 am 5b2a59d8: am 9885af05: am 9508e31d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev by Baligh Uddin · 13 years ago
  96. 5b2a59d am 9885af05: am 9508e31d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev by Baligh Uddin · 13 years ago
  97. 9885af0 am 9508e31d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev by Baligh Uddin · 13 years ago
  98. 9508e31 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev by Baligh Uddin · 13 years ago
  99. 3916779 am 07f1a6ce: (-s ours) am 78db8500: am 2c37f7b4: Merge "Synchronize access to Locked methods. DO NOT MERGE" into jb-mr1.1-dev by Craig Mautner · 13 years ago
  100. 07f1a6c am 78db8500: am 2c37f7b4: Merge "Synchronize access to Locked methods. DO NOT MERGE" into jb-mr1.1-dev by Craig Mautner · 13 years ago