Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / e5e9265e091c7dbbe25493e91e561e7deef6f4da
  1. e5e9265 Merge "Small change for new sample test code" into nyc-dev by Mary Yanchar · 8 years ago
  2. 99ec81a Merge changes from topic 'n-versioncode' into nyc-dev by Scott Main · 8 years ago
  3. fba3187 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c am: badb5f2a03 by Sudheer Shanka · 8 years ago
  4. 4c77b60 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9 am: 62c6ce4ca0 by Sudheer Shanka · 8 years ago
  5. 1c2e884 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c by Sudheer Shanka · 8 years ago
  6. 7efc56c Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc am: 827f465492 by Sudheer Shanka · 8 years ago
  7. 5753af8 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9 by Sudheer Shanka · 8 years ago
  8. badb5f2 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 by Sudheer Shanka · 8 years ago
  9. 8d302da Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc by Sudheer Shanka · 8 years ago
  10. 62c6ce4 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea by Sudheer Shanka · 8 years ago
  11. 827f465 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 by Sudheer Shanka · 8 years ago
  12. 7fd31ca Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours by Sudheer Shanka · 8 years ago
  13. 71bb55a DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours by Sudheer Shanka · 8 years ago
  14. 8fedc77 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours by Sudheer Shanka · 8 years ago
  15. eacf98bf DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d am: 923f622c15 am: 042fb63071 by Sudheer Shanka · 8 years ago
  16. 3c7e989 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d am: 923f622c15 by Sudheer Shanka · 8 years ago
  17. 29e4cd6 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df by Sudheer Shanka · 8 years ago
  18. 3f8c974 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours am: 1781d2bd3b am: f428d49b12 am: 21d4b84547 by Sudheer Shanka · 8 years ago
  19. 1310d53 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 by Sudheer Shanka · 8 years ago
  20. 2f0228c Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f by Sudheer Shanka · 8 years ago
  21. 94b739d Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours am: 1781d2bd3b am: f428d49b12 by Sudheer Shanka · 8 years ago
  22. 9d3efc7 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4 am: 6b77a4ee55 am: 91ff18a1f6 by Sudheer Shanka · 8 years ago
  23. 042fb63 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d by Sudheer Shanka · 8 years ago
  24. b235bc6 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 by Sudheer Shanka · 8 years ago
  25. 2a2c463 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4 am: 6b77a4ee55 by Sudheer Shanka · 8 years ago
  26. 1b0deba DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad by Sudheer Shanka · 8 years ago
  27. 923f622 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours by Sudheer Shanka · 8 years ago
  28. 8074c53 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours by Sudheer Shanka · 8 years ago
  29. 20bafe8 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc by Sudheer Shanka · 8 years ago
  30. 21d4b84 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours am: 1781d2bd3b by Sudheer Shanka · 8 years ago
  31. f428d49 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours by Sudheer Shanka · 8 years ago
  32. 91ff18a DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4 by Sudheer Shanka · 8 years ago
  33. 011172a Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 am: 96d70301e6 am: 018d1e7e1e by Sudheer Shanka · 8 years ago
  34. fcc3d8f Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f by Sudheer Shanka · 8 years ago
  35. 7f99a18 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416 by Sudheer Shanka · 8 years ago
  36. fc2bef0 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 am: 96d70301e6 by Sudheer Shanka · 8 years ago
  37. c6d9bdd DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours by Sudheer Shanka · 8 years ago
  38. af97c88 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours by Sudheer Shanka · 8 years ago
  39. 1781d2b Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 by Sudheer Shanka · 8 years ago
  40. 6b77a4e DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours by Sudheer Shanka · 8 years ago
  41. 1d053b3 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf by Sudheer Shanka · 8 years ago
  42. 6f17061 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 by Sudheer Shanka · 8 years ago
  43. ac143d2 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a by Sudheer Shanka · 8 years ago
  44. 018d1e7 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 by Sudheer Shanka · 8 years ago
  45. e44f8fc DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb by Sudheer Shanka · 8 years ago
  46. 51bcb05 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours by Sudheer Shanka · 8 years ago
  47. 426ba52 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 by Sudheer Shanka · 8 years ago
  48. c60146d Merge "docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide" into nyc-dev by Kevin Hufnagle · 8 years ago
  49. acb3eb3 Small change for new sample test code by Mary Yanchar · 8 years ago
  50. 271aa24 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 by Sudheer Shanka · 8 years ago
  51. ff9a8d7 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 by Sudheer Shanka · 8 years ago
  52. 3fca892 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 by Sudheer Shanka · 8 years ago
  53. e8e3012 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours by Sudheer Shanka · 8 years ago
  54. f4844b3 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b by Sudheer Shanka · 8 years ago
  55. c1b2e6d DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb by Sudheer Shanka · 8 years ago
  56. e85152c DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours by Sudheer Shanka · 8 years ago
  57. 94da8023 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev by Sudheer Shanka · 8 years ago
  58. 5c53e1b DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 by Sudheer Shanka · 8 years ago
  59. a4c9bbe Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev by Sudheer Shanka · 8 years ago
  60. a437e7f DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb by Sudheer Shanka · 8 years ago
  61. 96d7030 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev by Sudheer Shanka · 8 years ago
  62. 2f44f90 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b by Sudheer Shanka · 8 years ago
  63. 43a1f74 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev by Sudheer Shanka · 8 years ago
  64. bab9c10 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours by Sudheer Shanka · 8 years ago
  65. da6be5b A little more on issue #30766518: Document what targeting N does by Dianne Hackborn · 8 years ago
  66. b358ee3 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev by Sudheer Shanka · 8 years ago
  67. d1e3e53 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev by Sudheer Shanka · 8 years ago
  68. 900550de Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev by Sudheer Shanka · 8 years ago
  69. 3807727 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev by Sudheer Shanka · 8 years ago
  70. e70ebd6 Merge "Fix deadlock in AcitivityManagerService." into nyc-dev by Sudheer Shanka · 8 years ago
  71. 52fd8f8 Merge "docs: Fixed language directory issue localization" into nyc-dev by Eric Schmidt · 8 years ago
  72. 491bc2b Cherrypick so we can publish N version code description ASAP by Dianne Hackborn · 8 years ago
  73. 49ed3eb docs: Added descriptions of "Pricing Template ID" column to in-app by Kevin Hufnagle · 8 years ago
  74. f032cbf update DAC landings for Studio 2.2 by smain@google.com · 8 years ago
  75. 8279621 Fix build break due to automerge of 7d2198b5 am: baae57ab24 am: 009e08116f am: d6a5f68f52 am: a81dd677d3 am: ad004292e1 am: cc3287ef42 by Paul Jensen · 8 years ago
  76. f8d3ded Fix build break due to automerge of 7d2198b5 am: baae57ab24 am: 009e08116f am: d6a5f68f52 am: a81dd677d3 am: ad004292e1 by Paul Jensen · 8 years ago
  77. cc3287e Fix build break due to automerge of 7d2198b5 am: baae57ab24 am: 009e08116f am: d6a5f68f52 am: a81dd677d3 by Paul Jensen · 8 years ago
  78. ad00429 Fix build break due to automerge of 7d2198b5 am: baae57ab24 am: 009e08116f am: d6a5f68f52 by Paul Jensen · 8 years ago
  79. a81dd67 Fix build break due to automerge of 7d2198b5 am: baae57ab24 am: 009e08116f by Paul Jensen · 8 years ago
  80. d6a5f68 Fix build break due to automerge of 7d2198b5 am: baae57ab24 am: 009e08116f by Paul Jensen · 8 years ago
  81. 009e081 Fix build break due to automerge of 7d2198b5 am: baae57ab24 by Paul Jensen · 8 years ago
  82. baae57a Fix build break due to automerge of 7d2198b5 by Paul Jensen · 8 years ago
  83. 410b6d6 Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c045807b am: 7c08c4d5cc am: 963ca6f947 am: 3532f10fcb am: 849f1ba2d9 am: b7ba9fd70f am: 4121b70a7d am: c875015cc5 am: 66482b555a am: bedb94754b by Paul Jensen · 8 years ago
  84. c206923 Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b586 am: 9c1cb7a273 am: 6634e90ad7 am: 66ee2296a9 am: d37eb76465 am: ddce8664bd am: 4fd2cc7277 am: 2855de1e7c am: 53a9c65c8d am: 34e77bb699 by Paul Jensen · 8 years ago
  85. a728ecf Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c045807b am: 7c08c4d5cc am: 963ca6f947 am: 3532f10fcb am: 849f1ba2d9 am: b7ba9fd70f am: 4121b70a7d am: c875015cc5 am: 66482b555a by Paul Jensen · 8 years ago
  86. d3a9c09 Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b586 am: 9c1cb7a273 am: 6634e90ad7 am: 66ee2296a9 am: d37eb76465 am: ddce8664bd am: 4fd2cc7277 am: 2855de1e7c am: 53a9c65c8d by Paul Jensen · 8 years ago
  87. bedb947 Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c045807b am: 7c08c4d5cc am: 963ca6f947 am: 3532f10fcb am: 849f1ba2d9 am: b7ba9fd70f am: 4121b70a7d am: c875015cc5 by Paul Jensen · 8 years ago
  88. 34e77bb Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b586 am: 9c1cb7a273 am: 6634e90ad7 am: 66ee2296a9 am: d37eb76465 am: ddce8664bd am: 4fd2cc7277 am: 2855de1e7c by Paul Jensen · 8 years ago
  89. 66482b5 Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c045807b am: 7c08c4d5cc am: 963ca6f947 am: 3532f10fcb am: 849f1ba2d9 am: b7ba9fd70f am: 4121b70a7d by Paul Jensen · 8 years ago
  90. 53a9c65 Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b586 am: 9c1cb7a273 am: 6634e90ad7 am: 66ee2296a9 am: d37eb76465 am: ddce8664bd am: 4fd2cc7277 by Paul Jensen · 8 years ago
  91. c875015 Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c045807b am: 7c08c4d5cc am: 963ca6f947 am: 3532f10fcb am: 849f1ba2d9 am: b7ba9fd70f by Paul Jensen · 8 years ago
  92. 4121b70 Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c045807b am: 7c08c4d5cc am: 963ca6f947 am: 3532f10fcb am: 849f1ba2d9 by Paul Jensen · 8 years ago
  93. 2855de1 Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b586 am: 9c1cb7a273 am: 6634e90ad7 am: 66ee2296a9 am: d37eb76465 am: ddce8664bd by Paul Jensen · 8 years ago
  94. 4fd2cc7 Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b586 am: 9c1cb7a273 am: 6634e90ad7 am: 66ee2296a9 am: d37eb76465 by Paul Jensen · 8 years ago
  95. b7ba9fd Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c045807b am: 7c08c4d5cc am: 963ca6f947 am: 3532f10fcb by Paul Jensen · 8 years ago
  96. ddce866 Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b586 am: 9c1cb7a273 am: 6634e90ad7 am: 66ee2296a9 by Paul Jensen · 8 years ago
  97. 849f1ba Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c045807b am: 7c08c4d5cc am: 963ca6f947 by Paul Jensen · 8 years ago
  98. d37eb76 Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b586 am: 9c1cb7a273 am: 6634e90ad7 by Paul Jensen · 8 years ago
  99. 3532f10 Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c045807b am: 7c08c4d5cc by Paul Jensen · 8 years ago
  100. 66ee229 Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b586 am: 9c1cb7a273 by Paul Jensen · 8 years ago