Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 307218c7f2e3edac95c2d4d31fa3beadcde3d30c
  1. 307218c resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp by Andreas Gampe · 11 years ago
  2. 55dbf00 am 0da1cbaa: am e042791e: Merge "Frameworks/base: Remove unused header" by Andreas Gampe · 11 years ago
  3. 0991072 am ed368be7: Merge "Frameworks/base: Wall Werror in media/tests" by Andreas Gampe · 11 years ago
  4. 0da1cba am e042791e: Merge "Frameworks/base: Remove unused header" by Andreas Gampe · 11 years ago
  5. ed368be Merge "Frameworks/base: Wall Werror in media/tests" by Andreas Gampe · 11 years ago
  6. e042791 Merge "Frameworks/base: Remove unused header" by Andreas Gampe · 11 years ago
  7. 5c374a5 am b3d0580f: am 08229e81: Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev by Zoltan Szatmary-Ban · 11 years ago
  8. 99d983b am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev by Zoltan Szatmary-Ban · 11 years ago
  9. b3d0580 am 08229e81: Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev by Zoltan Szatmary-Ban · 11 years ago
  10. b3e8ff0 am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev by Zoltan Szatmary-Ban · 11 years ago
  11. 08229e8 Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev by Zoltan Szatmary-Ban · 11 years ago
  12. 0733433 Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev by Zoltan Szatmary-Ban · 11 years ago
  13. 416a0b1 am 0653f508: Merge "Don\'t allow an uncreated Network to satsify requests." into lmp-mr1-dev by Paul Jensen · 11 years ago
  14. 934b73f am 0653f508: Merge "Don\'t allow an uncreated Network to satsify requests." into lmp-mr1-dev by Paul Jensen · 11 years ago
  15. 0653f50 Merge "Don't allow an uncreated Network to satsify requests." into lmp-mr1-dev by Paul Jensen · 11 years ago
  16. e400f81 am 8a2ac41d: am e548c3a3: am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev automerge: 90ed95f by Geoffrey Borggaard · 11 years ago
  17. 0b3963e am d9e6f658: am 462b3201: am e9b5dfc0: am 25bf00bc: docs: Fixes to the Data Layer Wear class. automerge: 8837ce2 by Ricardo Cervera · 11 years ago
  18. bc25040 am d4ea7b3c: am 9aede602: am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev automerge: 161dce4 by Ricardo Cervera · 11 years ago
  19. 5a42975 am 5ea0411f: am a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge: 96c5d37 by Filip Gruszczynski · 11 years ago
  20. 8a2ac41 am e548c3a3: am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev automerge: 90ed95f by Geoffrey Borggaard · 11 years ago
  21. a1c2b6a am d3e2fd99: am c79173c7: am 05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs automerge: b5b9c9b by Andrew Solovay · 11 years ago
  22. 7e28e78 am 2d732006: am 03c80408: am 6c43e6b5: Fix and be more explicit about plurals best practices. automerge: 4db3fc1 by Elliott Hughes · 11 years ago
  23. d9e6f65 am 462b3201: am e9b5dfc0: am 25bf00bc: docs: Fixes to the Data Layer Wear class. automerge: 8837ce2 by Ricardo Cervera · 11 years ago
  24. d4ea7b3 am 9aede602: am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev automerge: 161dce4 by Ricardo Cervera · 11 years ago
  25. 5ea0411 am a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge: 96c5d37 by Filip Gruszczynski · 11 years ago
  26. 448d1ff am 40343340: am ef629f1f: am a79acc03: Doc change: localized content. automerge: 4d82f8a by Dirk Dougherty · 11 years ago
  27. 2dc4cfa am 74bafd41: am 555d6e70: am 2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs automerge: 6e08d30 by smain@google.com · 11 years ago
  28. e548c3a am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev by Geoffrey Borggaard · 11 years ago
  29. 5b51858 am ecccf10b: am 5b944f4a: am 8428c114: am 9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc. automerge: a1e1890 by Quddus Chong · 11 years ago
  30. fbff019 am 58238d90: am 9ab79551: am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev automerge: ddc83df by Deepanshu Gupta · 11 years ago
  31. 5a75a66 am d3e2fd99: am c79173c7: am 05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs automerge: b5b9c9b by Andrew Solovay · 11 years ago
  32. 7676f57 am b4a23798: am 1150292d: am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev automerge: a0bc2e7 -s ours by Deepanshu Gupta · 11 years ago
  33. 889a259 am 2d732006: am 03c80408: am 6c43e6b5: Fix and be more explicit about plurals best practices. automerge: 4db3fc1 by Elliott Hughes · 11 years ago
  34. 1896e58 am 40343340: am ef629f1f: am a79acc03: Doc change: localized content. automerge: 4d82f8a by Dirk Dougherty · 11 years ago
  35. 462b320 am e9b5dfc0: am 25bf00bc: docs: Fixes to the Data Layer Wear class. by Ricardo Cervera · 11 years ago
  36. 39d6b21 am 74bafd41: am 555d6e70: am 2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs automerge: 6e08d30 by smain@google.com · 11 years ago
  37. 9aede60 am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev by Ricardo Cervera · 11 years ago
  38. a83c580 Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev by Filip Gruszczynski · 11 years ago
  39. d3e2fd9 am c79173c7: am 05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs by Andrew Solovay · 11 years ago
  40. ecccf10 am 5b944f4a: am 8428c114: am 9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc. automerge: a1e1890 by Quddus Chong · 11 years ago
  41. 58238d9 am 9ab79551: am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev automerge: ddc83df by Deepanshu Gupta · 11 years ago
  42. b4a2379 am 1150292d: am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev automerge: a0bc2e7 -s ours by Deepanshu Gupta · 11 years ago
  43. 2d73200 am 03c80408: am 6c43e6b5: Fix and be more explicit about plurals best practices. by Elliott Hughes · 11 years ago
  44. 4034334 am ef629f1f: am a79acc03: Doc change: localized content. automerge: 4d82f8a by Dirk Dougherty · 11 years ago
  45. 74bafd4 am 555d6e70: am 2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs by smain@google.com · 11 years ago
  46. 5b944f4 am 8428c114: am 9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc. by Quddus Chong · 11 years ago
  47. 9ab7955 am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev by Deepanshu Gupta · 11 years ago
  48. 1150292 am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev by Deepanshu Gupta · 11 years ago
  49. dc3e7d2 am ed06df13: am 1bd81e31: Merge "Doze: Make proximity check configurable." into lmp-mr1-dev by John Spurlock · 11 years ago
  50. ed06df1 am 1bd81e31: Merge "Doze: Make proximity check configurable." into lmp-mr1-dev by John Spurlock · 11 years ago
  51. 1bd81e3 Merge "Doze: Make proximity check configurable." into lmp-mr1-dev by John Spurlock · 11 years ago
  52. 5b0528b am b2b8dcba: am ad064d48: Merge "Recents backup helper" into lmp-mr1-dev by Christopher Tate · 11 years ago
  53. ac280c4 am 8ae85003: Merge "Update scrollbars to match Material spec" into lmp-mr1-dev by Alan Viverette · 11 years ago
  54. a35d07a am 69fe1e8e: Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev by Alan Viverette · 11 years ago
  55. 676b1d8 am 28096c49: Merge "Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev by Dianne Hackborn · 11 years ago
  56. 235fcdc am 271ddfce: Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev automerge: e4590cf automerge: db1e7fa by Geoffrey Borggaard · 11 years ago
  57. 686e4d5 Doze: Make proximity check configurable. by John Spurlock · 11 years ago
  58. ea28d45 am e0a377f5: Merge "Make DeviceDefault alert dialog themes public" into lmp-mr1-dev by Alan Viverette · 11 years ago
  59. 30246e3 am 4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev by Erik Kline · 11 years ago
  60. 51efa8e am 83fb64e8: Merge "If the surface is lost, release it" into lmp-mr1-dev by John Reck · 11 years ago
  61. 18e3727 am 0b2dac34: Merge "Rename callDrawGLFunction" into lmp-mr1-dev by John Reck · 11 years ago
  62. 3458abd am 002bc810: Merge "ASLD: ASLD\'s XML reversible flag can turn off the reverse behavior now." into lmp-mr1-dev by ztenghui · 11 years ago
  63. b5ba786 am 18ab5c21: Merge "Add an API to check availability of Ethernet interface." into lmp-mr1-dev by Jaewan Kim · 11 years ago
  64. 1432a40 am df84cb90: Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev by Eino-Ville Talvala · 11 years ago
  65. c229c39 am 09ff9125: Merge "Convert record channel mask for dynamic mix" into lmp-mr1-dev by Jean-Michel Trivi · 11 years ago
  66. 0d6512a am 93ef9639: Merge "Improve ColorMatrix docs" into lmp-mr1-dev by Chris Craik · 11 years ago
  67. 2a5663d am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev by Adrian Roos · 11 years ago
  68. cf047b5 am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev by Adrian Roos · 11 years ago
  69. 117f0c1 am 25418aab: Merge "Ensure arraylist index is montonically decreasing" into lmp-mr1-dev by Craig Mautner · 11 years ago
  70. 496c670 am 1d76d397: Merge "Fix wifi reconnection tests." into lmp-mr1-dev by Eric Rowe · 11 years ago
  71. 49414b5 am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev by Wink Saville · 11 years ago
  72. 07fb2457 am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev by Wink Saville · 11 years ago
  73. 3985b44 am 37983832: Merge "Use package name as custom resolver process name" into lmp-mr1-dev by Craig Mautner · 11 years ago
  74. 36671b9 am 825e0da2: Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev by Adam Lesinski · 11 years ago
  75. 37368d7 am 79de0066: Merge "Fix wifi tethering tests." into lmp-mr1-dev by Eric Rowe · 11 years ago
  76. b2b8dcb am ad064d48: Merge "Recents backup helper" into lmp-mr1-dev by Christopher Tate · 11 years ago
  77. ad064d4 Merge "Recents backup helper" into lmp-mr1-dev by Christopher Tate · 11 years ago
  78. fa4eba9 am 8ae85003: Merge "Update scrollbars to match Material spec" into lmp-mr1-dev by Alan Viverette · 11 years ago
  79. 8ae8500 Merge "Update scrollbars to match Material spec" into lmp-mr1-dev by Alan Viverette · 11 years ago
  80. 69b802f am 69fe1e8e: Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev by Alan Viverette · 11 years ago
  81. 69fe1e8 Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev by Alan Viverette · 11 years ago
  82. aed1268 am a19f0577: am 8ccf071a: Merge "Move default token handling into WindowManagerImpl" into lmp-mr1-dev by Alan Viverette · 11 years ago
  83. 16c5d25 am 05275a2c: am 93da37a0: Merge "Add padding above and below dialog lists to match Material spec" into lmp-mr1-dev by Alan Viverette · 11 years ago
  84. cfaac8d am 12c03e33: am f66f3052: Merge "TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView." into lmp-mr1-dev by Jae Seo · 11 years ago
  85. c43613b am 28096c49: Merge "Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev by Dianne Hackborn · 11 years ago
  86. 28096c4 Merge "Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev by Dianne Hackborn · 11 years ago
  87. 24b1c23 Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION by Dianne Hackborn · 11 years ago
  88. 199ea8c Update overflow menu alignment to match spec by Alan Viverette · 11 years ago
  89. 6a110c1 am 271ddfce: Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev automerge: e4590cf automerge: db1e7fa by Geoffrey Borggaard · 11 years ago
  90. 7d97be9d am 91ab2665: am 52bfa332: Merge "TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()" into lmp-mr1-dev by Jae Seo · 11 years ago
  91. 71bda35 am 89d8fb55: am 7edaf55a: Merge "TIF: fix setSurface() logic" into lmp-mr1-dev by Jae Seo · 11 years ago
  92. 4ddbed3 am de04d557: am 7c122b60: Merge "Use SystemClock time to keep track of last event times. (Bug 17995039)" into lmp-mr1-dev by Winson Chung · 11 years ago
  93. aba9aba am c2af9be6: am bfab323c: Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-mr1-dev by Geoffrey Borggaard · 11 years ago
  94. 5b01f08 am 42d9bf66: am a6d2789c: Merge "Add new empty app test entry points." into lmp-mr1-dev by Dianne Hackborn · 11 years ago
  95. 377d6f0 am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev by Dianne Hackborn · 11 years ago
  96. 0d4a4e6 am a603f083: am 2bf6529b: Merge "Verify NFC permission immediately on API calls." into lmp-mr1-dev by Martijn Coenen · 11 years ago
  97. bbf0f66 am 3ef3a9bf: am ac4af18b: Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev by RoboErik · 11 years ago
  98. 216c089 am 50b02d61: am 5b881d43: Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev by RoboErik · 11 years ago
  99. 84b988e am 0783a61d: am a9b67771: Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-dev by Shishir Agrawal · 11 years ago
  100. f2235b6 resolve merge conflicts of 57b641a to lmp-mr1-dev-plus-aosp. by Chris Craik · 11 years ago