Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / e2831a181f14dd6ca0e601a4c3cdc313a58faaae
  1. e2831a1 resolved conflicts for merge of 5369b769 to master by Chris Craik · 10 years ago
  2. 5369b76 resolve merge conflicts of ed211b9 to lmp-mr1-dev-plus-aosp. by Chris Craik · 10 years ago
  3. 88daefb am 16d73a75: am a96ba381: Merge "Only add successfully bound profile services to mProfileServices." into lmp-mr1-dev automerge: df55bf4 by Benjamin Franz · 10 years ago
  4. 6d0b2c5 resolved conflicts for merge of f9d2cd99 to master by Joe Fernandez · 10 years ago
  5. 4c7ec3d am e4e1687d: am 5a64a475: am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs automerge: 4ded0a1 by Joe Fernandez · 10 years ago
  6. 7132a5b am a3bc48c8: am e39fc96c: Merge "Ignore accessibility overlay when computing window\'s interactive region." into lmp-mr1-dev automerge: a706c90 by Svet Ganov · 10 years ago
  7. 12a44ca am 1032dac1: am 596d4e72: am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps automerge: ee501ed by Luan Nguyen · 10 years ago
  8. 5eb898e am 9e5e1cf2: am e03e2456: Merge "NoMan: Apply audio restrictions when effects are disabled by listeners." into lmp-mr1-dev automerge: 24ca556 by John Spurlock · 10 years ago
  9. cb05679 am f85a91e4: am d6372242: Merge "Further work on issue #18640385: Add procstats test mode" into lmp-mr1-dev automerge: d525891 by Dianne Hackborn · 10 years ago
  10. d2190ae am 4af46d69: (-s ours) am 5431d1e9: (-s ours) am 2bb00d52: (-s ours) Import translations. DO NOT MERGE automerge: da409fe -s ours by Geoff Mendal · 10 years ago
  11. 51090417 am 3a426694: am eb4de876: Merge "Update API and documentation for invalid subscriptions id\'s" into lmp-mr1-dev automerge: afd6f5a by Wink Saville · 10 years ago
  12. 69ff299 am 9b287368: am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev automerge: 7557ec1 by Dianne Hackborn · 10 years ago
  13. 664effc am 71433a90: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: e1bc1c6 -s ours by Geoff Mendal · 10 years ago
  14. 93cfdbe am 94f01a76: (-s ours) am 295dc004: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: 2f5e130 -s ours by Geoff Mendal · 10 years ago
  15. d2a4320 am 647130ba: am 7a17e0b6: Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev automerge: 8642803 by Craig Mautner · 10 years ago
  16. 274b9c9 am bcce1830: am c79343ce: Merge "Fix SysUI when an app started from the affordances crashes" into lmp-mr1-dev automerge: 57b440e by Jorim Jaggi · 10 years ago
  17. 8be6bae am 9b0f0d11: am 35850627: Merge "BluetoothControllerImpl: track bluetooth better" into lmp-mr1-dev automerge: b394253 by Dan Sandler · 10 years ago
  18. 669a6c7 am f26040f0: (-s ours) am fa3f4314: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: 4ce2c65 -s ours by Geoff Mendal · 10 years ago
  19. 6356659 am 1fb48099: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: 83c26e1 -s ours by Geoff Mendal · 10 years ago
  20. 513250e am 0840f961: (-s ours) am b7180c45: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: 2a5f0b4 -s ours by Geoff Mendal · 10 years ago
  21. d9a7b8d am f8830fc5: am 28fffd58: Merge "CarrierText clear itself when no mob. data support" into lmp-mr1-dev automerge: 9309db8 by Jason Monk · 10 years ago
  22. ec58395 am e8c7fe77: (-s ours) Import translations. DO NOT MERGE automerge: f6e3882 -s ours by Geoff Mendal · 10 years ago
  23. 0bf20be am 34b3b53f: am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev automerge: 56d2e8f by Erik Kline · 10 years ago
  24. 9ca4ff5 am c97788f0: am 7cc203d7: am f49c37e7: am 933005e9: am 900efcc9: docs: Add details to Packaging Wearable apps. automerge: e4afef4 by Ricardo Cervera · 10 years ago
  25. 60648a6 am c6ff4552: am 17cf7789: am 5ff08052: am dfd05f0a: am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs automerge: 39409f2 by Joe Fernandez · 10 years ago
  26. c07bbcb am fc1e25f3: am d56b7a39: am 504e213f: am ea15366a: am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs automerge: a41a241 by Ricardo Cervera · 10 years ago
  27. b2edc00 am b8217ea7: am 2a34e719: am c0d08616: am c6361d8d: Merge "docs: Add details to Packaging Wearable apps." into lmp-dev automerge: 7061697 by Ricardo Cervera · 10 years ago
  28. 953cf63 am 85cc4090: am 0342d70e: am f94ee2c1: am ec656c51: am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs automerge: 1b46c2c by Ricardo Cervera · 10 years ago
  29. edefe7e am 6b4a1c6c: am e3703050: Add recovery kmsg to dropbox automerge: 6aa6733 by Patrick Tjin · 10 years ago
  30. 2c3c4b1 am 835ad716: am 5a267e72: am 5b16e21b: am 6554bb45: am 1a2308bb: Merge "misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased l by smain@google.com · 10 years ago
  31. 54ebc61 am b721e45a: am 913a683d: am f8527c7f: am c3ae2596: am 1e824284: Merge "docs: Add Distributing to Android Wear doc" into lmp-docs automerge: caad620 by Joe Fernandez · 10 years ago
  32. 1e667f6 am b33c8fb4: am 600224c9: am 730a52d0: am eb09f898: am d412b9ab: Merge "docs: Add new classes to Wearable UI library" into lmp-docs automerge: 768d97d by Ricardo Cervera · 10 years ago
  33. 55338ad am 9c6e82e7: am 45ea5690: am 5edaf136: am be80b984: am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs automerge: 739d0a8c by Ricardo Cervera · 10 years ago
  34. 36e2280 am d7100111: am 15e0f7fd: am bdb327ad: am c24c5797: am 09e72628: Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs automerge: 20baf9e by Quddus Chong · 10 years ago
  35. 1ee272b am f60f29d0: am c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev automerge: e832393 by Andre Eisenbach · 10 years ago
  36. 7a27bc3 am 09378975: resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp by Eric Laurent · 10 years ago
  37. 38b5d05 am 93c5cf6a: am 7438b57c: am 2de55513: Merge "Only one task within the stack should moveToBack" by Craig Mautner · 10 years ago
  38. cf3e91f am dc101a11: Always take an activity screenshot when pausing. automerge: 37f2718 automerge: bfa6059 by Wale Ogunwale · 10 years ago
  39. e289aaf am f1ffc75c: Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev automerge: dad85a6 automerge: 7acd880 by Amith Yamasani · 10 years ago
  40. 18a635c am 584674c3: am c6de3212: Merge "Don\'t try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev automerge: 422db53 by Michael Wright · 10 years ago
  41. f16df1f am 236dc2c8: am 1102e712: Merge "Throw IOException when missing default ringtone." into lmp-mr1-dev automerge: 8650c35 by Jeff Sharkey · 10 years ago
  42. fcc3a8c am 41a635e0: (-s ours) am a82fc60c: am 6d481852: am b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs automerge: d36d2aa automerge: 509815b by Joe Fernandez · 10 years ago
  43. ed211b9 am f441557d: Merge "Fix frame-allocated path lifecycles" into lmp-mr1-dev by Chris Craik · 10 years ago
  44. f441557 Merge "Fix frame-allocated path lifecycles" into lmp-mr1-dev by Chris Craik · 10 years ago
  45. 7f29f2e Merge "Import translations. DO NOT MERGE" by Geoff Mendal · 10 years ago
  46. 16d73a7 am a96ba381: Merge "Only add successfully bound profile services to mProfileServices." into lmp-mr1-dev by Benjamin Franz · 10 years ago
  47. df55bf4 am a96ba381: Merge "Only add successfully bound profile services to mProfileServices." into lmp-mr1-dev by Benjamin Franz · 10 years ago
  48. a96ba38 Merge "Only add successfully bound profile services to mProfileServices." into lmp-mr1-dev by Benjamin Franz · 10 years ago
  49. 4ac36f8 Fix frame-allocated path lifecycles by Chris Craik · 10 years ago
  50. f9d2cd9 am 844af56b: am efab8b6f: am bdd6aabd: am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs by Joe Fernandez · 10 years ago
  51. 15cfa4f am 844af56b: am efab8b6f: am bdd6aabd: am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs by Joe Fernandez · 10 years ago
  52. e4e1687 am 5a64a475: am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs by Joe Fernandez · 10 years ago
  53. 844af56 am efab8b6f: am bdd6aabd: am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs by Joe Fernandez · 10 years ago
  54. 4ded0a16 am 5a64a475: am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs by Joe Fernandez · 10 years ago
  55. efab8b6 am bdd6aabd: am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs by Joe Fernandez · 10 years ago
  56. 5a64a47 am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs by Joe Fernandez · 10 years ago
  57. a3bc48c am e39fc96c: Merge "Ignore accessibility overlay when computing window\'s interactive region." into lmp-mr1-dev by Svet Ganov · 10 years ago
  58. a706c90 am e39fc96c: Merge "Ignore accessibility overlay when computing window\'s interactive region." into lmp-mr1-dev by Svet Ganov · 10 years ago
  59. bdd6aab am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs by Joe Fernandez · 10 years ago
  60. 9727d19 am 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs by Joe Fernandez · 10 years ago
  61. 1032dac am 596d4e72: am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps by Luan Nguyen · 10 years ago
  62. 1372d45 Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  63. e39fc96 Merge "Ignore accessibility overlay when computing window's interactive region." into lmp-mr1-dev by Svet Ganov · 10 years ago
  64. ee501ed am 596d4e72: am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps by Luan Nguyen · 10 years ago
  65. d49977d Merge "docs: update debug menu for debugging-studio" into lmp-docs by Joe Fernandez · 10 years ago
  66. 534ae16 am 3454091d: Merge "docs:studio basic links" into lmp-docs by Joe Fernandez · 10 years ago
  67. 9e5e1cf am e03e2456: Merge "NoMan: Apply audio restrictions when effects are disabled by listeners." into lmp-mr1-dev by John Spurlock · 10 years ago
  68. 596d4e7 am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps by Luan Nguyen · 10 years ago
  69. f85a91e am d6372242: Merge "Further work on issue #18640385: Add procstats test mode" into lmp-mr1-dev by Dianne Hackborn · 10 years ago
  70. 4af46d6 am 5431d1e9: (-s ours) am 2bb00d52: (-s ours) Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  71. 3a42669 am eb4de876: Merge "Update API and documentation for invalid subscriptions id\'s" into lmp-mr1-dev by Wink Saville · 10 years ago
  72. 3454091 Merge "docs:studio basic links" into lmp-docs by Joe Fernandez · 10 years ago
  73. 24ca556 am e03e2456: Merge "NoMan: Apply audio restrictions when effects are disabled by listeners." into lmp-mr1-dev by John Spurlock · 10 years ago
  74. 9b28736 am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev by Dianne Hackborn · 10 years ago
  75. 71433a9 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev by Geoff Mendal · 10 years ago
  76. 94f01a7 am 295dc004: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev by Geoff Mendal · 10 years ago
  77. c9e5c5f am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps by Luan Nguyen · 10 years ago
  78. 647130b am 7a17e0b6: Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev by Craig Mautner · 10 years ago
  79. bcce183 am c79343ce: Merge "Fix SysUI when an app started from the affordances crashes" into lmp-mr1-dev by Jorim Jaggi · 10 years ago
  80. 9b0f0d1 am 35850627: Merge "BluetoothControllerImpl: track bluetooth better" into lmp-mr1-dev by Dan Sandler · 10 years ago
  81. e03e245 Merge "NoMan: Apply audio restrictions when effects are disabled by listeners." into lmp-mr1-dev by John Spurlock · 10 years ago
  82. bea1510 docs: update debug menu for debugging-studio by Rich Slogar · 10 years ago
  83. f26040f am fa3f4314: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev by Geoff Mendal · 10 years ago
  84. 1fb4809 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev by Geoff Mendal · 10 years ago
  85. 0840f96 am b7180c45: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev by Geoff Mendal · 10 years ago
  86. 8a65df3 am 258da738: docs: Fix text on step 5 of the opt-in steps by Luan Nguyen · 10 years ago
  87. f8830fc am 28fffd58: Merge "CarrierText clear itself when no mob. data support" into lmp-mr1-dev by Jason Monk · 10 years ago
  88. e8c7fe7 Import translations. DO NOT MERGE automerge: f6e3882 -s ours by Geoff Mendal · 10 years ago
  89. 34b3b53 am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev by Erik Kline · 10 years ago
  90. c97788f am 7cc203d7: am f49c37e7: am 933005e9: am 900efcc9: docs: Add details to Packaging Wearable apps. by Ricardo Cervera · 10 years ago
  91. 7668e78 resolved conflicts for merge of 3bae94d7 to master by Nick Kralevich · 10 years ago
  92. c6ff455 am 17cf7789: am 5ff08052: am dfd05f0a: am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs by Joe Fernandez · 10 years ago
  93. fc1e25f am d56b7a39: am 504e213f: am ea15366a: am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs by Ricardo Cervera · 10 years ago
  94. b8217ea am 2a34e719: am c0d08616: am c6361d8d: Merge "docs: Add details to Packaging Wearable apps." into lmp-dev by Ricardo Cervera · 10 years ago
  95. 85cc409 am 0342d70e: am f94ee2c1: am ec656c51: am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs by Ricardo Cervera · 10 years ago
  96. 6b4a1c6 am e3703050: Add recovery kmsg to dropbox automerge: 6aa6733 by Patrick Tjin · 10 years ago
  97. 835ad71 am 5a267e72: am 5b16e21b: am 6554bb45: am 1a2308bb: Merge "misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language." int by smain@google.com · 10 years ago
  98. 8403b75 NoMan: Apply audio restrictions when effects are disabled by listeners. by John Spurlock · 10 years ago
  99. b721e45 am 913a683d: am f8527c7f: am c3ae2596: am 1e824284: Merge "docs: Add Distributing to Android Wear doc" into lmp-docs by Joe Fernandez · 10 years ago
  100. b33c8fb am 600224c9: am 730a52d0: am eb09f898: am d412b9ab: Merge "docs: Add new classes to Wearable UI library" into lmp-docs by Ricardo Cervera · 10 years ago