Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 79758c8e7706f3cce265a881cc66df8771d3c456
  1. 79758c8 Merge "AAPT2: Fix merging of styleables the right way" by Adam Lesinski · 8 years ago
  2. a08ca06 Merge "Moar test cases for NetworkPolicyManagerServiceTest." by Felipe Leme · 8 years ago
  3. 994e590 Play sound on ACTION_DOWN for navigation keys am: 05bce15da9 am: 9bdfbd7c82 by Jorim Jaggi · 8 years ago
  4. 0a38c9f Merge "ContextHubManager: Document InstanceInfo bug" into nyc-mr1-dev am: 73f511e471 am: 3a41c5b654 by Brian Duddie · 8 years ago
  5. ed2a5f8 ContextHubManager: Document InstanceInfo bug am: 3be73d3950 am: 6f155aa4bf by Greg Kaiser · 8 years ago
  6. 1c3d6ef Merge "Document correct context for obtaining WifiManager" into nyc-mr1-dev am: 855210170c am: 1377955965 by Paul Stewart · 8 years ago
  7. c4ec49b Document correct context for obtaining WifiManager am: 0e164b199e am: b09557b3cf by Paul Stewart · 8 years ago
  8. 155374e Merge "Configure code coverage filters." into nyc-mr1-dev am: 6bf296f6dc am: baac84303c by Allen Hair · 8 years ago
  9. 63180a0 Configure code coverage filters. am: 02fd609460 am: 15b70213a4 am: 8b931e08d0 by Allen Hair · 8 years ago
  10. de9fc0f Merge "Fix AccountManagerServiceTest" into nyc-mr1-dev am: 4be496d2d0 am: 429a0197bf by Fyodor Kupolov · 8 years ago
  11. d6d2855 Fix AccountManagerServiceTest am: d954357860 am: 658b8e7e4b am: eac40d9949 by Fyodor Kupolov · 8 years ago
  12. a33f506 Merge "Fetch ga script over https to avoid mixed content." into nyc-dev am: c2b9d55818 am: 61f52fca96 am: be1a09ef47 am: c49ce72fd8 by Dirk Dougherty · 8 years ago
  13. 94d11ce Fetch ga script over https to avoid mixed content. am: b5760c1fe7 am: 324054e7d4 am: 26901d3715 am: 5e34cccda6 by Dirk Dougherty · 8 years ago
  14. 796c3de Merge "Fetch ga script over https to avoid mixed content." into nyc-dev am: c2b9d55818 am: 4019963b96 by Dirk Dougherty · 8 years ago
  15. 6512ae7 Fetch ga script over https to avoid mixed content. am: b5760c1fe7 am: 9ca38e3379 by Dirk Dougherty · 8 years ago
  16. 398e930 Merge "ContextHub: Avoid reference leaks" into nyc-mr1-dev am: 6bf3424ccf am: 34230195ab by Brian Duddie · 8 years ago
  17. 9293b93 ContextHub: Avoid reference leaks am: c35104535c am: e2478c4cb6 am: e2107bfe13 by Andrew Rossignol · 8 years ago
  18. a402325 Merge "Track java.lang.reflect.Executable API changes" am: 43ec5716aa am: eefc000601 am: d8d495f1eb by Neil Fuller · 8 years ago
  19. 8e4fda7 Merge "Backup system QS tiles" into nyc-dr1-dev am: f498d0d384 am: 68d7519060 am: b481f7ce7d by Jason Monk · 8 years ago
  20. 90a788e resolve merge conflicts of d70ed99 to master by Jason Monk · 8 years ago
  21. 3f98ea1 Merge "forceUpdateUserSetupComplete should have no effect in user build" by Victor Chang · 8 years ago
  22. 808699f ContextHubService: Avoid uninitialized handle am: 9d4d881cc5 am: b70ed04911 by Greg Kaiser · 8 years ago
  23. 1d3e3eb8 Merge "NanoAppFilter: Workaround HubId issues" into nyc-mr1-dev am: f8d61675ac am: a0ce60d36f by Greg Kaiser · 8 years ago
  24. 786676e NanoAppFilter: Workaround HubId issues am: 3907049080 am: 41ef2a038d by Greg Kaiser · 8 years ago
  25. a1500b4 Merge "ContextHubService: Maintain hub result meaning" into nyc-mr1-dev am: 18e59f2988 am: d06faffad8 by Greg Kaiser · 8 years ago
  26. fb574cb ContextHubService: Maintain hub result meaning am: 6d9e7f669a am: 9ea48989ce by Greg Kaiser · 8 years ago
  27. 7976a9d Merge "ContextHubManager: Fix API documentation." into nyc-mr1-dev am: 1e07e392c3 am: d5b81eb77d by Greg Kaiser · 8 years ago
  28. 45cad7f ContextHubManager: Fix API documentation. am: fac5be2ace am: 921e7ef350 by Greg Kaiser · 8 years ago
  29. 2359eea Merge changes I896af608,I2e2a65bc,I8d9ae8b9,Ibb07666a into nyc-mr1-dev am: 6ef2cee605 am: bb4fbb631c by Greg Kaiser · 8 years ago
  30. 3a6cd70 ContextHubService: Fix app query am: 10163d0dd2 am: c5ab788398 am: 460ad1b1dd by Greg Kaiser · 8 years ago
  31. 974c0b6 ContextHubService: Don't double report app loads am: fe6d4f518a am: ca627a8cc3 by Greg Kaiser · 8 years ago
  32. 2aa29a7 ContextHubService: Make app handle size match Java am: f8210797ad am: ddf97f6b1f by Greg Kaiser · 8 years ago
  33. 1e71d3b ContextHubService: Update caches on nanoapp unload am: 0d052c9508 am: e7a0e1a771 by Greg Kaiser · 8 years ago
  34. bed286d Merge "Add simple NetdService util class" into nyc-mr1-dev am: 592552220b am: 78540f798d by Erik Kline · 8 years ago
  35. f00f053 Add simple NetdService util class am: c1bc0be161 am: b92c7205dd am: 1a35a05e56 by Erik Kline · 8 years ago
  36. 026b656 Merge "Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am: 314d995ca1 am: b3ab8337df" into nyc-mr1-dev am: 000289bc6c am: d6cfb23841 by Mark Lu · 8 years ago
  37. 23ad078 Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am: 314d995ca1 am: b3ab8337df am: 4b492cbf09 am: 3e0f9837f3 by Mark Lu · 8 years ago
  38. 0fdbb3c Merge "docs: Fix typo and broken link in AsyncTask.java am: 53415ff24e am: bae52ec98c" into nyc-mr1-dev am: 6be20ff728 am: 426a9411a2 by Mark Lu · 8 years ago
  39. 0243c47 docs: Fix typo and broken link in AsyncTask.java am: 53415ff24e am: bae52ec98c am: 86caa4aebf am: b48098f836 by Mark Lu · 8 years ago
  40. 85301ba Merge "Fixing typo in dump log." into nyc-mr1-dev am: 5ebd73f8ff am: ba4744bc08 by Winson Chung · 8 years ago
  41. f59c50c Fixing typo in dump log. am: b43ba86811 am: 1de1a3bfcc am: fc4a87580f by Winson · 8 years ago
  42. d214430 Merge "docs: fix link in Loader reference page" into nyc-dev am: 3c638c1ea1 am: ceaef72fb9 am: a5f090a768 am: 975704a737 by Mark Lu · 8 years ago
  43. f7e2156 docs: fix link in Loader reference page am: 9f52b7a4a8 am: f496b9a981 am: e16c82d224 am: bfe0c86461 by Mark Lu · 8 years ago
  44. f59b044 Merge "Resolving race condition while writing recent taskids" into nyc-mr1-dev am: 769bc6c8b1 am: 9dbdbf461e by Suprabh Shukla · 8 years ago
  45. 888a459 Resolving race condition while writing recent taskids am: fd0bd4f39d am: c9e7c49def by Suprabh Shukla · 8 years ago
  46. de90e22 Merge "resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25 am: 7a46fac0cd" into nyc-dev am: fea9feb30e am: c3a6dbd46e am: 5d146ccdb8 am: 1167bcf2c9 by Sudheer Shanka · 8 years ago
  47. 431579e Merge "resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25 am: 7a46fac0cd am: d57565864b am: c18b88c15d am: 1c153c697b am: 20e7a6b448" into nyc-mr1-dev-plus-aosp by Sudheer Shanka · 8 years ago
  48. 1d0e9cc resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25 am: 7a46fac0cd am: d57565864b am: c18b88c15d am: 1c153c697b am: 20e7a6b448 by Sudheer Shanka · 8 years ago
  49. 04df0c5 Merge "Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc -s ours" into nyc-dev am: cca29c7284 am: 2ea71d8c64 am: 2c18f32328 am: 7a50c5afd2" into nyc-mr1-dev-plus-aosp by Sudheer Shanka · 8 years ago
  50. 1ae20e5 Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc -s ours" into nyc-dev am: cca29c7284 am: 2ea71d8c64 am: 2c18f32328 am: 7a50c5afd2 by Sudheer Shanka · 8 years ago
  51. 1dc0347a Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc -s ours am: 02ba5ef875 am: 26fa4042e1 am: c16baae14f am: c44432439f" into nyc-mr1-dev-plus-aosp by Sudheer Shanka · 8 years ago
  52. 027e7a3 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc -s ours am: 02ba5ef875 am: 26fa4042e1 am: c16baae14f am: c44432439f by Sudheer Shanka · 8 years ago
  53. 132e601 Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca am: 7586e03e06 -s ours" into nyc-dev am: 5f5403def8 am: d8ffc6239b am: 710c5ea5a6 am: 586fa0cefd" into nyc-mr1-dev-plus-aosp by Amith Yamasani · 8 years ago
  54. d1ac36c Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca am: 7586e03e06 -s ours" into nyc-dev am: 5f5403def8 am: d8ffc6239b am: 710c5ea5a6 am: 586fa0cefd by Amith Yamasani · 8 years ago
  55. d4776b5 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca am: 7586e03e06 -s ours am: 4a3caefd6c am: f7259775d8 am: 216e40b926 am: 3025752705" into nyc-mr1-dev-plus-aosp by Amith Yamasani · 8 years ago
  56. 2ad78f2 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca am: 7586e03e06 -s ours am: 4a3caefd6c am: f7259775d8 am: 216e40b926 am: 3025752705 by Amith Yamasani · 8 years ago
  57. d8fe2c8 Merge "Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b -s ours" into nyc-dev am: 555fbf30d2 am: 12a668fde8 am: 148acfcb45 am: cb6f2eeb33" into nyc-mr1-dev-plus-aosp by Sudheer Shanka · 8 years ago
  58. 95c22f5 Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b -s ours" into nyc-dev am: 555fbf30d2 am: 12a668fde8 am: 148acfcb45 am: cb6f2eeb33 by Sudheer Shanka · 8 years ago
  59. 7fb0c49 Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b -s ours am: 6a9490f850 am: 380d9b9486 am: ea35f92f98 am: d5be8af093" into nyc-mr1-dev-plus-aosp by Sudheer Shanka · 8 years ago
  60. 40b2477 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b -s ours am: 6a9490f850 am: 380d9b9486 am: ea35f92f98 am: d5be8af093 by Sudheer Shanka · 8 years ago
  61. 7071097 Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180 -s ours" into nyc-dev am: 4ee46e5b99 am: fda97bed8d am: af4f11bdf6 am: e18ec512c6" into nyc-mr1-dev-plus-aosp by Amith Yamasani · 8 years ago
  62. eee73a0 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180 -s ours" into nyc-dev am: 4ee46e5b99 am: fda97bed8d am: af4f11bdf6 am: e18ec512c6 by Amith Yamasani · 8 years ago
  63. 472cbe1 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180 -s ours am: b6cc1acb63 am: b6813f24ae am: 1c6048e697 am: 995980b3a1" into nyc-mr1-dev-plus-aosp by Amith Yamasani · 8 years ago
  64. 761779d DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180 -s ours am: b6cc1acb63 am: b6813f24ae am: 1c6048e697 am: 995980b3a1 by Amith Yamasani · 8 years ago
  65. 74947db Merge "Merge "docs: Fix typo" into nyc-dev am: 8d660eebad am: e24079f5b2 am: b354b01acf am: 0f91a8a84e" into nyc-mr1-dev-plus-aosp by Mark Goldstein · 8 years ago
  66. fe33fcd Merge "docs: Fix typo" into nyc-dev am: 8d660eebad am: e24079f5b2 am: b354b01acf am: 0f91a8a84e by Mark Goldstein · 8 years ago
  67. 9804224 Merge "Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am: 314d995ca1 am: c9fbef739f" into nyc-mr1-dev-plus-aosp by Mark Lu · 8 years ago
  68. d110cc1 Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am: 314d995ca1 am: c9fbef739f by Mark Lu · 8 years ago
  69. d2859d6 Merge "docs: Fix typo and broken link in AsyncTask.java am: 53415ff24e am: fc68813e5c" into nyc-mr1-dev-plus-aosp by Mark Lu · 8 years ago
  70. 810d3a5 docs: Fix typo and broken link in AsyncTask.java am: 53415ff24e am: fc68813e5c by Mark Lu · 8 years ago
  71. ddf4516 Merge "Merge "docs: fix link in Loader reference page" into nyc-dev am: 3c638c1ea1 am: 09e4d9bada" into nyc-mr1-dev-plus-aosp by Mark Lu · 8 years ago
  72. d31e6378 Merge "docs: fix link in Loader reference page" into nyc-dev am: 3c638c1ea1 am: 09e4d9bada by Mark Lu · 8 years ago
  73. 73a0f0e Merge "docs: fix link in Loader reference page am: 9f52b7a4a8 am: c6612637bb" into nyc-mr1-dev-plus-aosp by Mark Lu · 8 years ago
  74. 8e701d1 docs: fix link in Loader reference page am: 9f52b7a4a8 am: c6612637bb by Mark Lu · 8 years ago
  75. 3d294c2 Merge "Merge "resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25 am: 7a46fac0cd" into nyc-dev am: fea9feb30e am: fb3c06f8d1" into nyc-mr1-dev-plus-aosp by Sudheer Shanka · 8 years ago
  76. 1259c3b0 Merge "resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25 am: 7a46fac0cd" into nyc-dev am: fea9feb30e am: fb3c06f8d1 by Sudheer Shanka · 8 years ago
  77. 97b9951 Merge "resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25 am: 7a46fac0cd am: d57565864b am: 80ce19c380" into nyc-mr1-dev-plus-aosp by Sudheer Shanka · 8 years ago
  78. 6a15a91 resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25 am: 7a46fac0cd am: d57565864b am: 80ce19c380 by Sudheer Shanka · 8 years ago
  79. 480ea97 Merge "Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc -s ours" into nyc-dev am: cca29c7284 am: 7c17f2ee60" into nyc-mr1-dev-plus-aosp by Sudheer Shanka · 8 years ago
  80. 01943b5 Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc -s ours" into nyc-dev am: cca29c7284 am: 7c17f2ee60 by Sudheer Shanka · 8 years ago
  81. 640129a Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc -s ours am: 02ba5ef875 am: 39d2fe3a4b" into nyc-mr1-dev-plus-aosp by Sudheer Shanka · 8 years ago
  82. c35f8c6 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc -s ours am: 02ba5ef875 am: 39d2fe3a4b by Sudheer Shanka · 8 years ago
  83. 669541c Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca am: 7586e03e06 -s ours" into nyc-dev am: 5f5403def8 am: fd539fc8e0" into nyc-mr1-dev-plus-aosp by Amith Yamasani · 8 years ago
  84. 2e3cab0 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca am: 7586e03e06 -s ours" into nyc-dev am: 5f5403def8 am: fd539fc8e0 by Amith Yamasani · 8 years ago
  85. 04381d7 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca am: 7586e03e06 -s ours am: 4a3caefd6c am: 5e403681cd" into nyc-mr1-dev-plus-aosp by Amith Yamasani · 8 years ago
  86. 13dc5c1 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca am: 7586e03e06 -s ours am: 4a3caefd6c am: 5e403681cd by Amith Yamasani · 8 years ago
  87. dca7749 Merge "Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b -s ours" into nyc-dev am: 555fbf30d2 am: 80f80e7e70" into nyc-mr1-dev-plus-aosp by Sudheer Shanka · 8 years ago
  88. 0cfb466 Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b -s ours" into nyc-dev am: 555fbf30d2 am: 80f80e7e70 by Sudheer Shanka · 8 years ago
  89. 9854f00 Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b -s ours am: 6a9490f850 am: 6a031dec20" into nyc-mr1-dev-plus-aosp by Sudheer Shanka · 8 years ago
  90. 7c8b18f Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b -s ours am: 6a9490f850 am: 6a031dec20 by Sudheer Shanka · 8 years ago
  91. c090722 Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180 -s ours" into nyc-dev am: 4ee46e5b99 am: 3cf46af37b" into nyc-mr1-dev-plus-aosp by Amith Yamasani · 8 years ago
  92. bdd0034 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180 -s ours" into nyc-dev am: 4ee46e5b99 am: 3cf46af37b by Amith Yamasani · 8 years ago
  93. f70ec8e Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180 -s ours am: b6cc1acb63 am: 258c3eab25" into nyc-mr1-dev-plus-aosp by Amith Yamasani · 8 years ago
  94. 1bf4420 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180 -s ours am: b6cc1acb63 am: 258c3eab25 by Amith Yamasani · 8 years ago
  95. e6f165e Merge "Merge "docs: Fix typo" into nyc-dev am: 8d660eebad am: 7843568a38" into nyc-mr1-dev-plus-aosp by Mark Goldstein · 8 years ago
  96. 51dd804 Merge "docs: Fix typo" into nyc-dev am: 8d660eebad am: 7843568a38 am: d12051bf2d by Mark Goldstein · 8 years ago
  97. b2ccacd Merge "docs: Fix typo am: 1c22ae296b am: b348093ec4 am: 60a849ab32 am: b7f8646cdc" into nyc-mr1-dev-plus-aosp by Mark Goldstein · 8 years ago
  98. f11864e docs: Fix typo am: 1c22ae296b am: b348093ec4 am: 60a849ab32 am: b7f8646cdc by Mark Goldstein · 8 years ago
  99. c2ecea2 Merge "resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a21569cd76 am: b0429bbad5 am: 1238ffcd2c am: 22585d75f9 am: 36b9c90299 am: 6bb536748e" into nyc-mr1-dev-plus-aosp by Narayan Kamath · 8 years ago
  100. 21885fc resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a21569cd76 am: b0429bbad5 am: 1238ffcd2c am: 22585d75f9 am: 36b9c90299 am: 6bb536748e by Narayan Kamath · 8 years ago