Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 5a52c9806d4348a2879a2b28fd13d18520e69bfc
  1. 5a52c98 resolve merge conflicts of 5ea76c1 to master by Tyler Gunn · 8 years ago
  2. 53d530b Merge "switch utm_medium to utm_source fix a couple hashes update the test recorder URL from TAC to DAC am: 01569c41e7 am: b893a93dc1 am: 9b15d59862" by Android Build Merger (Role) · 8 years ago
  3. 916f7d5 switch utm_medium to utm_source fix a couple hashes update the test recorder URL from TAC to DAC am: 01569c41e7 am: b893a93dc1 by smain@google.com · 8 years ago
  4. a5be2d6 Merge "Merge "Merge "Disable battery saver when booting with sufficient battery" into nyc-mr1-dev am: 99ff7405a3 am: 44d11d1328" into nyc-mr1-dev-plus-aosp am: bda2522438" by Android Build Merger (Role) · 8 years ago
  5. 0b61c10 Merge "Merge "Disable battery saver when booting with sufficient battery" into nyc-mr1-dev am: 99ff7405a3 am: 44d11d1328 am: cd71b2b177" by Android Build Merger (Role) · 8 years ago
  6. a0d8fcc Merge "Merge "Disable battery saver when booting with sufficient battery" into nyc-mr1-dev am: 99ff7405a3 am: 44d11d1328" into nyc-mr1-dev-plus-aosp by Michael Wright · 8 years ago
  7. c56b2c3 Merge "Disable battery saver when booting with sufficient battery" into nyc-mr1-dev am: 99ff7405a3 am: 44d11d1328 by Michael Wright · 8 years ago
  8. 4526dfb Merge "Merge "Merge "docs: improve docs for sqlite package summary" into nyc-dev am: 0a544fa4a7 am: 0be2abbce1" into nyc-mr1-dev-plus-aosp am: 4581479302" by Android Build Merger (Role) · 8 years ago
  9. 568c16f Merge "Merge "docs: improve docs for sqlite package summary" into nyc-dev am: 0a544fa4a7 am: 0be2abbce1 am: 6cb04e103b" by Android Build Merger (Role) · 8 years ago
  10. ca56e78 Merge "Merge "docs: improve docs for sqlite package summary" into nyc-dev am: 0a544fa4a7 am: 0be2abbce1" into nyc-mr1-dev-plus-aosp by Mark Lu · 8 years ago
  11. 7101d98 Merge "docs: improve docs for sqlite package summary" into nyc-dev am: 0a544fa4a7 am: 0be2abbce1 by Mark Lu · 8 years ago
  12. 1e518ca6 Merge "Merge "docs: improve docs for sqlite package summary am: 59640a9f1c am: 195099dc32" into nyc-mr1-dev-plus-aosp am: e19dac286d" by Android Build Merger (Role) · 8 years ago
  13. 067b066 Merge "docs: improve docs for sqlite package summary am: 59640a9f1c am: 195099dc32 am: 2f90f2c53a" by Android Build Merger (Role) · 8 years ago
  14. c17e4ff Merge "docs: improve docs for sqlite package summary am: 59640a9f1c am: 195099dc32" into nyc-mr1-dev-plus-aosp by Mark Lu · 8 years ago
  15. b920dc4 docs: improve docs for sqlite package summary am: 59640a9f1c am: 195099dc32 by Mark Lu · 8 years ago
  16. d35688a Merge "Merge "Disable battery saver when booting with sufficient battery am: 2763c2ba6c am: 994c5722d6" into nyc-mr1-dev-plus-aosp am: cba0f3e8e4" by Android Build Merger (Role) · 8 years ago
  17. 2c4adce Merge "Disable battery saver when booting with sufficient battery am: 2763c2ba6c am: 994c5722d6 am: 804a1d266a" by Android Build Merger (Role) · 8 years ago
  18. 344b0fc Merge "Disable battery saver when booting with sufficient battery am: 2763c2ba6c am: 994c5722d6" into nyc-mr1-dev-plus-aosp by Michael Wright · 8 years ago
  19. a2f01d0 Disable battery saver when booting with sufficient battery am: 2763c2ba6c am: 994c5722d6 by Michael Wright · 8 years ago
  20. b99f4dc Merge "Merge "Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev am: b764c94a26 am: 8d7dfafadf" into nyc-mr1-dev-plus-aosp am: f0d2d9cffa" by Android Build Merger (Role) · 8 years ago
  21. 1c252f9 Merge "Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev am: b764c94a26 am: 8d7dfafadf am: b5be488467" by Android Build Merger (Role) · 8 years ago
  22. 05ff76a Merge "Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev am: b764c94a26 am: 8d7dfafadf" into nyc-mr1-dev-plus-aosp by Mark Lu · 8 years ago
  23. 5518005 Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev am: b764c94a26 am: 8d7dfafadf by Mark Lu · 8 years ago
  24. 1acaae5 Merge "Merge "Merge "Docs: Fix missing space" into nyc-dev am: fd0a31c0aa am: 70399b36ce am: 5ca7164e54 am: 3ecd86b7c6" into nyc-mr1-dev-plus-aosp am: b98f8235ea" by Android Build Merger (Role) · 8 years ago
  25. 9aea7b6 Merge "Merge "Docs: Fix missing space" into nyc-dev am: fd0a31c0aa am: 70399b36ce am: 5ca7164e54 am: 3ecd86b7c6 am: 93da468b5f" by Android Build Merger (Role) · 8 years ago
  26. 7d1b14d Merge "Merge "Docs: Fix missing space" into nyc-dev am: fd0a31c0aa am: 70399b36ce am: 5ca7164e54 am: 3ecd86b7c6" into nyc-mr1-dev-plus-aosp by Josh Horwich · 8 years ago
  27. af524b1 Merge "Docs: Fix missing space" into nyc-dev am: fd0a31c0aa am: 70399b36ce am: 5ca7164e54 am: 3ecd86b7c6 by Josh Horwich · 8 years ago
  28. bf3b1f1 Merge "Merge "docs: Update docs for SQLiteDatabase replace methods am: 1e20208d90 am: 5dc8052df6" into nyc-mr1-dev-plus-aosp am: 5f71bfc72f" by Android Build Merger (Role) · 8 years ago
  29. 73d6f91 Merge "docs: Update docs for SQLiteDatabase replace methods am: 1e20208d90 am: 5dc8052df6 am: 901e97e133" by Android Build Merger (Role) · 8 years ago
  30. 0d56c4c Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review [DO NOT MERGE] am: f02ae5e23c -s ours" by Android Build Merger (Role) · 8 years ago
  31. 0980482 Merge "docs: Update docs for SQLiteDatabase replace methods am: 1e20208d90 am: 5dc8052df6" into nyc-mr1-dev-plus-aosp by Mark Lu · 8 years ago
  32. 1289f99 docs: Update docs for SQLiteDatabase replace methods am: 1e20208d90 am: 5dc8052df6 by Mark Lu · 8 years ago
  33. 686f576 [NAN] Replace int peerId with more opaqure Object peerHandle per API review [DO NOT MERGE] by Etan Cohen · 8 years ago
  34. 07fff2f Merge "Docs: Fix missing space am: 999fe148e4 am: 0413b48aba am: 0f895d3d9c am: 3818ca2a95" into nyc-mr1-dev-plus-aosp by Josh Horwich · 8 years ago
  35. 762e6ae Docs: Fix missing space am: 999fe148e4 am: 0413b48aba am: 0f895d3d9c am: 3818ca2a95 by Josh Horwich · 8 years ago
  36. 9b15d59 switch utm_medium to utm_source fix a couple hashes update the test recorder URL from TAC to DAC am: 01569c41e7 by smain@google.com · 8 years ago
  37. 36cb097 Merge "Fixed a typo in the code sample" into nyc-dev am: 537481e2c3 am: 3b4add4667 by Mark Lu · 8 years ago
  38. 5ea76c1 Change data usage alert/disabled messages. am: 65ed8f9512 am: d7a14989a9 by Tyler Gunn · 8 years ago
  39. bda2522 Merge "Merge "Disable battery saver when booting with sufficient battery" into nyc-mr1-dev am: 99ff7405a3 am: 44d11d1328" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  40. cd71b2b Merge "Disable battery saver when booting with sufficient battery" into nyc-mr1-dev am: 99ff7405a3 by Michael Wright · 8 years ago
  41. 4581479 Merge "Merge "docs: improve docs for sqlite package summary" into nyc-dev am: 0a544fa4a7 am: 0be2abbce1" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  42. 6cb04e1 Merge "docs: improve docs for sqlite package summary" into nyc-dev am: 0a544fa4a7 by Mark Lu · 8 years ago
  43. 17158c5 Merge "Merge "DO NOT MERGE Track generics in API definition." into nyc-mr1-dev am: 6f1b29ef67 am: ad5ef71eff" into nyc-mr1-dev-plus-aosp by Michael Wright · 8 years ago
  44. 52b1a7b Merge "DO NOT MERGE Track generics in API definition." into nyc-mr1-dev am: 6f1b29ef67 am: ad5ef71eff by Michael Wright · 8 years ago
  45. e19dac2 Merge "docs: improve docs for sqlite package summary am: 59640a9f1c am: 195099dc32" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  46. cba0f3e Merge "Disable battery saver when booting with sufficient battery am: 2763c2ba6c am: 994c5722d6" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  47. 2f90f2c docs: improve docs for sqlite package summary am: 59640a9f1c am: 195099dc32 by Mark Lu · 8 years ago
  48. f0d2d9c Merge "Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev am: b764c94a26 am: 8d7dfafadf" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  49. 94f938a Fixed a typo in the code sample am: 247d1c9ea8 am: 9fa6e02d2d am: 7829ef7cf0 by Hemal Patel · 8 years ago
  50. 804a1d2 Disable battery saver when booting with sufficient battery am: 2763c2ba6c by Michael Wright · 8 years ago
  51. b98f823 Merge "Merge "Docs: Fix missing space" into nyc-dev am: fd0a31c0aa am: 70399b36ce am: 5ca7164e54 am: 3ecd86b7c6" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  52. b5be488 Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev am: b764c94a26 by Mark Lu · 8 years ago
  53. 5f71bfc Merge "docs: Update docs for SQLiteDatabase replace methods am: 1e20208d90 am: 5dc8052df6" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  54. 93da468 Merge "Docs: Fix missing space" into nyc-dev am: fd0a31c0aa am: 70399b36ce am: 5ca7164e54 by Josh Horwich · 8 years ago
  55. 901e97e docs: Update docs for SQLiteDatabase replace methods am: 1e20208d90 by Mark Lu · 8 years ago
  56. 00fb669 Merge "Docs: Fix missing space am: 999fe148e4 am: 0413b48aba am: 0f895d3d9c am: 3818ca2a95" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  57. 4ab5657 Docs: Fix missing space am: 999fe148e4 am: 0413b48aba am: 0f895d3d9c by Josh Horwich · 8 years ago
  58. cb0c4c5 Merge "Fixed a typo in the code sample" into nyc-dev am: 537481e2c3 by Mark Lu · 8 years ago
  59. b893a93 switch utm_medium to utm_source fix a couple hashes update the test recorder URL from TAC to DAC by smain@google.com · 8 years ago
  60. d7a1498 Change data usage alert/disabled messages. am: 65ed8f9512 by Tyler Gunn · 8 years ago
  61. 3e952ac Merge "Merge "DO NOT MERGE Track generics in API definition." into nyc-mr1-dev am: 6f1b29ef67 am: ad5ef71eff" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  62. 7a7a82c Merge "DO NOT MERGE Track generics in API definition." into nyc-mr1-dev am: 6f1b29ef67 by Michael Wright · 8 years ago
  63. 7829ef7 Fixed a typo in the code sample am: 247d1c9ea8 am: 9fa6e02d2d by Hemal Patel · 8 years ago
  64. eb8253c Merge "Merge commit 'e022ea98ee6029f9431d7c33704fea71f9fd527f' into manual_merge_e022ea9" into nyc-mr1-dev-plus-aosp by Michael Wright · 8 years ago
  65. de8bdf3 Merge commit 'e022ea98ee6029f9431d7c33704fea71f9fd527f' into manual_merge_e022ea9 by Michael Wright · 8 years ago
  66. 0be2abb Merge "docs: improve docs for sqlite package summary" into nyc-dev by Mark Lu · 8 years ago
  67. 195099d docs: improve docs for sqlite package summary am: 59640a9f1c by Mark Lu · 8 years ago
  68. 01569c4 switch utm_medium to utm_source by smain@google.com · 8 years ago
  69. 8d7dfaf Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev by Mark Lu · 8 years ago
  70. 5dc8052 docs: Update docs for SQLiteDatabase replace methods am: 1e20208d90 by Mark Lu · 8 years ago
  71. 862fbe0 Merge "Merge commit 'e022ea98ee6029f9431d7c33704fea71f9fd527f' into manual_merge_e022ea9" into nyc-mr1-dev-plus-aosp by TreeHugger Robot · 8 years ago
  72. 3b4add4 Merge "Fixed a typo in the code sample" into nyc-dev am: 537481e2c3 by Mark Lu · 8 years ago
  73. 44d11d1 Merge "Disable battery saver when booting with sufficient battery" into nyc-mr1-dev by Michael Wright · 8 years ago
  74. 9fa6e02 Fixed a typo in the code sample am: 247d1c9ea8 by Hemal Patel · 8 years ago
  75. 994c572 Disable battery saver when booting with sufficient battery am: 2763c2ba6c by Michael Wright · 8 years ago
  76. f573fcb Merge commit 'e022ea98ee6029f9431d7c33704fea71f9fd527f' into manual_merge_e022ea9 by Michael Wright · 8 years ago
  77. 99ff740 Merge "Disable battery saver when booting with sufficient battery" into nyc-mr1-dev by TreeHugger Robot · 8 years ago
  78. 0a544fa Merge "docs: improve docs for sqlite package summary" into nyc-dev by Mark Lu · 8 years ago
  79. b764c94 Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev by Mark Lu · 8 years ago
  80. 537481e Merge "Fixed a typo in the code sample" into nyc-dev by Mark Lu · 8 years ago
  81. 82fac58 Merge "Custom pointer icon for DatePicker and TimePicker" by TreeHugger Robot · 8 years ago
  82. 8b82662 Merge "[NAN] Change Broadcast for NAN status change to notification only" am: e1513a8cc6 am: f95a3703c1 am: c83ae8d290 by Etan Cohen · 8 years ago
  83. b041ae4 Merge "[NAN] Change Broadcast for NAN status change to notification only" am: e1513a8cc6 am: f95a3703c1 by Etan Cohen · 8 years ago
  84. c83ae8d Merge "[NAN] Change Broadcast for NAN status change to notification only" am: e1513a8cc6 by Etan Cohen · 8 years ago
  85. f95a370 Merge "[NAN] Change Broadcast for NAN status change to notification only" by Etan Cohen · 8 years ago
  86. e1513a8 Merge "[NAN] Change Broadcast for NAN status change to notification only" by Etan Cohen · 8 years ago
  87. ff70a92 Merge "Track generics in API definition." by TreeHugger Robot · 8 years ago
  88. d7e63b5 Merge "Docs: Fix missing space" into nyc-dev am: fd0a31c0aa am: 2cad9a8e69 by Josh Horwich · 8 years ago
  89. 3ecd86b Merge "Docs: Fix missing space" into nyc-dev am: fd0a31c0aa am: 70399b36ce by Josh Horwich · 8 years ago
  90. 3818ca2 Docs: Fix missing space am: 999fe148e4 am: 0413b48aba am: 0f895d3d9c by Josh Horwich · 8 years ago
  91. ad5ef71 Merge "DO NOT MERGE Track generics in API definition." into nyc-mr1-dev by Michael Wright · 8 years ago
  92. 7b849bc Merge "Docs: Fix missing space am: 999fe148e4 am: be06ffc238 am: 10526c8ff8" by Android Build Merger (Role) · 8 years ago
  93. 7556262 Docs: Fix missing space am: 999fe148e4 am: be06ffc238 am: 10526c8ff8 by Josh Horwich · 8 years ago
  94. d2ecfc8 Merge "Remove unused private flags from View" by TreeHugger Robot · 8 years ago
  95. 5ca7164 Merge "Docs: Fix missing space" into nyc-dev am: fd0a31c0aa am: 70399b36ce by Josh Horwich · 8 years ago
  96. 02beabc Merge "Docs: Fix missing space" into nyc-dev am: fd0a31c0aa am: 2cad9a8e69 by Josh Horwich · 8 years ago
  97. cea665e Merge "Media: check Settings.AUTHORITY without userId" by TreeHugger Robot · 8 years ago
  98. 10526c8 Docs: Fix missing space am: 999fe148e4 am: be06ffc238 by Josh Horwich · 8 years ago
  99. 0f895d3 Docs: Fix missing space am: 999fe148e4 am: 0413b48aba by Josh Horwich · 8 years ago
  100. e022ea9 DO NOT MERGE Track generics in API definition. am: 62b7f8bf7c by Michael Wright · 8 years ago