Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 40b7598f1ce5bda788fe9b344656a24e57f3e745
  1. 40b7598 Merge "update metadata for the studio landing page cards (for 2.2 content) edit landing page banner ("a dozen" --> "20")" into nyc-dev by Scott Main · 9 years ago
  2. d7c3be8 update metadata for the studio landing page cards (for 2.2 content) edit landing page banner ("a dozen" --> "20") by smain@google.com · 9 years ago
  3. a1c28fa Merge "update metadata for the studio landing page cards (for 2.2 content) edit landing page banner ("a dozen" --> "20")" into nyc-dev by Scott Main · 9 years ago
  4. 0e98b64 update metadata for the studio landing page cards (for 2.2 content) by smain@google.com · 9 years ago
  5. 140c793 Merge "Small change for new sample test code" into nyc-dev am: e5e9265e09 by Mary Yanchar · 9 years ago
  6. be34171 Small change for new sample test code am: acb3eb39da by Mary Yanchar · 9 years ago
  7. e5e9265 Merge "Small change for new sample test code" into nyc-dev by Mary Yanchar · 9 years ago
  8. 9340130 Merge changes from topic 'n-versioncode' into nyc-dev am: 99ec81ab46 by Scott Main · 9 years ago
  9. 3da7e4e A little more on issue #30766518: Document what targeting N does am: da6be5b871 by Dianne Hackborn · 9 years ago
  10. bae1405 Cherrypick so we can publish N version code description ASAP am: 491bc2b8d6 by Dianne Hackborn · 9 years ago
  11. ad864c8f Merge "[NAN] Rename to make discovery explicit" am: 5706a8f535 am: eb4c838c46 by Etan Cohen · 9 years ago
  12. 99ec81a Merge changes from topic 'n-versioncode' into nyc-dev by Scott Main · 9 years ago
  13. eb4c838 Merge "[NAN] Rename to make discovery explicit" am: 5706a8f535 by Etan Cohen · 9 years ago
  14. 5706a8f Merge "[NAN] Rename to make discovery explicit" by Etan Cohen · 9 years ago
  15. 6d2cca0 Merge "WifiScanner: retrieve single scan results" am: 3c70a2fad2 am: c507bcaf63 by Rebecca Silberstein · 9 years ago
  16. c507bca Merge "WifiScanner: retrieve single scan results" am: 3c70a2fad2 by Rebecca Silberstein · 9 years ago
  17. 3c70a2f Merge "WifiScanner: retrieve single scan results" by Rebecca Silberstein · 9 years ago
  18. f6ce0bf 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 am: 1c2e8848dc -s ours by Sudheer Shanka · 9 years ago
  19. b5a0a8a 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 am: 5753af889b -s ours by Sudheer Shanka · 9 years ago
  20. 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 · 9 years ago
  21. 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 · 9 years ago
  22. 3a87b67 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 am: 8d302da986 -s ours by Sudheer Shanka · 9 years ago
  23. 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 · 9 years ago
  24. 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 · 9 years ago
  25. 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 · 9 years ago
  26. 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 · 9 years ago
  27. 34a5ce1 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 am: 3c7e989835 -s ours by Sudheer Shanka · 9 years ago
  28. 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 · 9 years ago
  29. 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 · 9 years ago
  30. 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 · 9 years ago
  31. 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 · 9 years ago
  32. 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 · 9 years ago
  33. 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 · 9 years ago
  34. 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 · 9 years ago
  35. 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 · 9 years ago
  36. b7fb715 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 am: 94b739d3a2 -s ours by Sudheer Shanka · 9 years ago
  37. 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 · 9 years ago
  38. 573c6a4 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4 am: 6b77a4ee55 am: 91ff18a1f6 am: 2a2c463a01 -s ours by Sudheer Shanka · 9 years ago
  39. 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 · 9 years ago
  40. 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 · 9 years ago
  41. 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 · 9 years ago
  42. 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 · 9 years ago
  43. 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 · 9 years ago
  44. 042fb630 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d by Sudheer Shanka · 9 years ago
  45. b235bc6 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 by Sudheer Shanka · 9 years ago
  46. 2a2c463 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4 am: 6b77a4ee55 by Sudheer Shanka · 9 years ago
  47. 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 · 9 years ago
  48. 923f622 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours by Sudheer Shanka · 9 years ago
  49. 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 · 9 years ago
  50. 20bafe8 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc by Sudheer Shanka · 9 years ago
  51. 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 · 9 years ago
  52. 543828d Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 am: 96d70301e6 am: 018d1e7e1e am: fc2bef0139 -s ours by Sudheer Shanka · 9 years ago
  53. f2bb102 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416 am: 6f170618ff -s ours by Sudheer Shanka · 9 years ago
  54. f428d49 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours by Sudheer Shanka · 9 years ago
  55. 91ff18a DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4 by Sudheer Shanka · 9 years ago
  56. 011172a Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 am: 96d70301e6 am: 018d1e7e1e by Sudheer Shanka · 9 years ago
  57. fcc3d8f Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f by Sudheer Shanka · 9 years ago
  58. 7f99a18 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416 by Sudheer Shanka · 9 years ago
  59. fc2bef0 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 am: 96d70301e6 by Sudheer Shanka · 9 years ago
  60. c6d9bdd DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours by Sudheer Shanka · 9 years ago
  61. 706a62f Merge "docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide" into nyc-dev by Kevin Hufnagle · 9 years ago
  62. af97c88 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours by Sudheer Shanka · 9 years ago
  63. f75816f docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide by Kevin Hufnagle · 9 years ago
  64. 1781d2b Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 by Sudheer Shanka · 9 years ago
  65. 6b77a4e DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours by Sudheer Shanka · 9 years ago
  66. 1d053b3 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf by Sudheer Shanka · 9 years ago
  67. 6f17061 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 by Sudheer Shanka · 9 years ago
  68. ac143d2 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a by Sudheer Shanka · 9 years ago
  69. 018d1e7 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 by Sudheer Shanka · 9 years ago
  70. 82842e8 Merge "[NAN] Update API: replace looper with handler" am: 0027ddf990 by Etan Cohen · 9 years ago
  71. e44f8fc DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb by Sudheer Shanka · 9 years ago
  72. 51bcb05 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours by Sudheer Shanka · 9 years ago
  73. 426ba52 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 by Sudheer Shanka · 9 years ago
  74. c60146d Merge "docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide" into nyc-dev by Kevin Hufnagle · 9 years ago
  75. acb3eb3 Small change for new sample test code by Mary Yanchar · 9 years ago
  76. 271aa24 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 by Sudheer Shanka · 9 years ago
  77. c074f1b Merge "[NAN] Update API: replace looper with handler" am: 0027ddf990 by Etan Cohen · 9 years ago
  78. 3855370 [NAN] Rename to make discovery explicit by Etan Cohen · 9 years ago
  79. ff9a8d7 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 by Sudheer Shanka · 9 years ago
  80. 3fca892 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 by Sudheer Shanka · 9 years ago
  81. e8e3012 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours by Sudheer Shanka · 9 years ago
  82. f4844b3 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b by Sudheer Shanka · 9 years ago
  83. c1b2e6d DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb by Sudheer Shanka · 9 years ago
  84. e85152c DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours by Sudheer Shanka · 9 years ago
  85. 94da8023 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev by Sudheer Shanka · 9 years ago
  86. 0027ddf Merge "[NAN] Update API: replace looper with handler" by Etan Cohen · 9 years ago
  87. 5c53e1b DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 by Sudheer Shanka · 9 years ago
  88. 0fbeb05 [NAN] Update API: replace looper with handler by Etan Cohen · 9 years ago
  89. b2a1ee1 Merge "Fix parameter description" am: 750b523aa2 am: df5f3e6db8 by Cuihtlauac ALVARADO · 9 years ago
  90. df5f3e6 Merge "Fix parameter description" am: 750b523aa2 by Cuihtlauac ALVARADO · 9 years ago
  91. 2046f3f Merge "Fix deadlock in AcitivityManagerService." into nyc-dev am: e70ebd694b by Sudheer Shanka · 9 years ago
  92. a4c9bbe Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev by Sudheer Shanka · 9 years ago
  93. 433a36e Fix deadlock in AcitivityManagerService. am: 67e05b4d28 by Sudheer Shanka · 9 years ago
  94. a437e7f DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb by Sudheer Shanka · 9 years ago
  95. 96d7030 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev by Sudheer Shanka · 9 years ago
  96. 2f44f90 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b by Sudheer Shanka · 9 years ago
  97. 43a1f74 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev by Sudheer Shanka · 9 years ago
  98. bab9c10 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours by Sudheer Shanka · 9 years ago
  99. da6be5b A little more on issue #30766518: Document what targeting N does by Dianne Hackborn · 9 years ago
  100. 750b523 Merge "Fix parameter description" by Treehugger Robot · 9 years ago