Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / f0bc8660d2b2e746f884f89324104a8420818d80 / Android.mk
  1. d1c50f6 resolve merge conflicts of 6e57aae to master by Selim Cinek · 8 years ago
  2. 6e57aae Merge \"Improve initial unlock delay (1/2)\" into nyc-mr1-dev am: 165b011a74 by Jorim Jaggi · 8 years ago
  3. e8fde5d Improve initial unlock delay (1/2) by Jorim Jaggi · 8 years ago
  4. 7e1ea94 Merge \"Merge \\"Merge \\\"remove \\\"referenceonly\\\" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates.\\\" into nyc-dev am: 83f71845af\\" into nyc-mr1-dev am: 925a5ffa5e\" into nyc-mr1-dev-plus-aosp by smain@google.com · 8 years ago
  5. c1108c3 Merge \"Merge \\"remove \\"referenceonly\\" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates.\\" into nyc-dev am: 83f71845af\" into nyc-mr1-dev by smain@google.com · 8 years ago
  6. c526ad0 Merge \"remove \"referenceonly\" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates.\" into nyc-dev by smain@google.com · 8 years ago
  7. f83ada9 Merge \\"Add callbacks to VoiceInteractionManagerService\\" into nyc-mr1-dev am: d58f07f58a by Annie Chin · 8 years ago
  8. d992523 Merge \"Add callbacks to VoiceInteractionManagerService\" into nyc-mr1-dev by Annie Chin · 8 years ago
  9. d58f07f Merge "Add callbacks to VoiceInteractionManagerService" into nyc-mr1-dev by Annie Chin · 8 years ago
  10. c179797 Merge \\"[net mgmt svc] add method to retrieve INetd reference\\" into nyc-mr1-dev am: 58ef88927d by Erik Kline · 8 years ago
  11. e62b36b Merge \"[net mgmt svc] add method to retrieve INetd reference\" into nyc-mr1-dev by Erik Kline · 8 years ago
  12. 4e37b70 [net mgmt svc] add method to retrieve INetd reference by Erik Kline · 8 years ago
  13. ecb9f3e Add callbacks to VoiceInteractionManagerService by Annie Chin · 8 years ago
  14. 8562ab5 remove "referenceonly" flag from the offline-docs build. by smain@google.com · 8 years ago
  15. b81ae49 Merge \\\"Add a flag to enable instrumentation of the framework classes.\\\" into nyc-dev am: 15783f0073 am: fb20170c0f by Allen Hair · 8 years ago
  16. b216e80 Merge \\"Add a flag to enable instrumentation of the framework classes.\\" into nyc-dev am: 15783f0073 by Allen Hair · 8 years ago
  17. fb20170 Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev by Allen Hair · 8 years ago
  18. 0e4f014 Add a flag to enable instrumentation of the framework classes. by Allen Hair · 8 years ago
  19. bf055ba Merge \\"Add InputMethodService#exposeContent()\\" into nyc-mr1-dev am: dc42d7dd13 by Yohei Yukawa · 8 years ago
  20. d02470f Merge \"Add InputMethodService#exposeContent()\" into nyc-mr1-dev am: dc42d7dd13 by Yohei Yukawa · 8 years ago
  21. 25e0813 Add InputMethodService#exposeContent() by Yohei Yukawa · 8 years ago
  22. 4926ee1 Merge \\\"Docs: Suppress errors in SystemApi Build Bug: 28427390\\\" into nyc-dev am: d06520a488 am: b7181150c4 by Gina Dimino · 8 years ago
  23. cb08f68 Merge \\"Docs: Suppress errors in SystemApi Build Bug: 28427390\\" into nyc-dev am: d06520a488 by Gina Dimino · 8 years ago
  24. b718115 Merge \"Docs: Suppress errors in SystemApi Build Bug: 28427390\" into nyc-dev by Gina Dimino · 8 years ago
  25. 0bae4dc Merge \"Docs: Suppress errors in SystemApi Build Bug: 28427390\" into nyc-dev by Gina Dimino · 8 years ago
  26. d06520a Merge "Docs: Suppress errors in SystemApi Build Bug: 28427390" into nyc-dev by Gina Dimino · 8 years ago
  27. 8930555 Merge \\\"Add API 24 to reference selector.\\\" into nyc-dev am: 398d088871 am: f44feb36b0 by Dirk Dougherty · 8 years ago
  28. f992a2a Merge \\"Add API 24 to reference selector.\\" into nyc-dev am: 398d088871 by Dirk Dougherty · 8 years ago
  29. f44feb3 Merge \"Add API 24 to reference selector.\" into nyc-dev am: 398d088871 by Dirk Dougherty · 8 years ago
  30. 8d129ef Merge \"Add API 24 to reference selector.\" into nyc-dev am: 398d088871 by Dirk Dougherty · 8 years ago
  31. 5f60f7c Add API 24 to reference selector. by Dirk Dougherty · 8 years ago
  32. 57ea9d0 Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev am: 6a5c9560a3 by Robert Greenwalt · 8 years ago
  33. c4e25b2 Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev am: 6a5c9560a3 by Robert Greenwalt · 8 years ago
  34. 37409c5 Add support for UNSOL PCO Data. by Robert Greenwalt · 8 years ago
  35. 98ad888 Docs: Suppress errors in SystemApi Build Bug: 28427390 by Gina Dimino · 8 years ago
  36. 4b07a03 Merge "Merge "Pass -yaml to ds builds to generate _book.yaml version of reference TOC." into mnc-mr-docs am: 5d8d511264 am: 6049306d8c am: c25a9b0104 am: 4569e9515c am: 48d8747041" into nyc-mr1-dev-plus-aosp by Dirk Dougherty · 9 years ago
  37. 48d8747 Merge "Pass -yaml to ds builds to generate _book.yaml version of reference TOC." into mnc-mr-docs am: 5d8d511264 am: 6049306d8c am: c25a9b0104 by Dirk Dougherty · 9 years ago
  38. 4569e95 Merge "Pass -yaml to ds builds to generate _book.yaml version of reference TOC." into mnc-mr-docs am: 5d8d511264 am: 6049306d8c by Dirk Dougherty · 9 years ago
  39. c25a9b0 Merge "Pass -yaml to ds builds to generate _book.yaml version of reference TOC." into mnc-mr-docs am: 5d8d511264 by Dirk Dougherty · 9 years ago
  40. dfa366d Pass -yaml to ds builds to generate _book.yaml version of reference TOC. by Dirk Dougherty · 9 years ago
  41. 53e7852 Merge "Fix API review comments, add remove callback." into nyc-dev am: d19191d am: 1b65983 by Martijn Coenen · 9 years ago
  42. 1b65983 Merge "Fix API review comments, add remove callback." into nyc-dev am: d19191d by Martijn Coenen · 9 years ago
  43. d19191d Merge "Fix API review comments, add remove callback." into nyc-dev by Martijn Coenen · 9 years ago
  44. 750ccd5 Manually merge branch 'nyc-mr1-dev-plus-aosp' to shortcircuit automerger b/28407115 by The Android Automerger · 9 years ago
  45. a2fcd05 Merge "resolve merge conflicts of 0d00d28 to nyc-dev" into nyc-dev am: 58a252d by Dirk Dougherty · 9 years ago
  46. d9036ba resolve merge conflicts of 0d00d28 to nyc-dev by Dirk Dougherty · 9 years ago
  47. db2174dc Merge "Ensure local settings caches are not stale" into nyc-dev am: f71d7fe am: d4bc15b by Svet Ganov · 9 years ago
  48. d4bc15b Merge "Ensure local settings caches are not stale" into nyc-dev am: f71d7fe by Svet Ganov · 9 years ago
  49. f71d7fe Merge "Ensure local settings caches are not stale" into nyc-dev by Svetoslav Ganov · 9 years ago
  50. 53a441c Ensure local settings caches are not stale by Svet Ganov · 9 years ago
  51. 0d00d28 Merge "Adjust root path for translated content dirs on devsite builds." into mnc-mr-docs am: face65fe16 by Dirk Dougherty · 9 years ago
  52. 879f5ba Merge "Cleanup of the PackageInstaller API - Frameworks" into nyc-dev am: c947ebd am: 70d720c by Svet Ganov · 9 years ago
  53. 70d720ca Merge "Cleanup of the PackageInstaller API - Frameworks" into nyc-dev by Svet Ganov · 9 years ago
  54. fa5a632 Merge "Unbundle RemoteService on TV - part 3" into nyc-dev am: 7981e8f am: a2262b3 by Sujith Ramakrishnan · 9 years ago
  55. ae0e03a Cleanup of the PackageInstaller API - Frameworks by Svet Ganov · 9 years ago
  56. c5826ee Merge "Unbundle RemoteService on TV - part 3" into nyc-dev am: 7981e8f by Sujith Ramakrishnan · 9 years ago
  57. de3f4ae Merge "Unbundle RemoteService on TV - part 3" into nyc-dev am: 7981e8f by Sujith Ramakrishnan · 9 years ago
  58. b5b86c1 Unbundle RemoteService on TV - part 3 by Sujith Ramakrishnan · 9 years ago
  59. 4465add Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev am: 729c640cc8 am: 45b1e14468 by Vladislav Kaznacheev · 9 years ago
  60. 45b1e14 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev by Vladislav Kaznacheev · 9 years ago
  61. 729c640 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev by Vladislav Kaznacheev · 9 years ago
  62. 377c328 Rename DropPermissions to DragAndDropPermissions by Vladislav Kaznacheev · 9 years ago
  63. e1ee098 Merge "Move UidRange aidl declaration to system/netd" into nyc-dev am: c618468 am: e7c7d77 by Robin Lee · 9 years ago
  64. e7c7d77 Merge "Move UidRange aidl declaration to system/netd" into nyc-dev am: c618468 by Robin Lee · 9 years ago
  65. c618468 Merge "Move UidRange aidl declaration to system/netd" into nyc-dev by Robin Lee · 9 years ago
  66. 1060694 Move UidRange aidl declaration to system/netd by Robin Lee · 9 years ago
  67. d55def8 Fix API review comments, add remove callback. by Martijn Coenen · 9 years ago
  68. 1d03aed Merge "Delete ITelephonyDebug and ITelephonyDebugSubscriber" into nyc-dev am: 0a97f22 by TreeHugger Robot · 9 years ago
  69. 5b2e531 Merge "Delete ITelephonyDebug and ITelephonyDebugSubscriber" into nyc-dev by Pavel Zhamaitsiak · 9 years ago
  70. 0a97f22 Merge "Delete ITelephonyDebug and ITelephonyDebugSubscriber" into nyc-dev by TreeHugger Robot · 9 years ago
  71. 3852c1f Adjust root path for translated content dirs on devsite builds. by Dirk Dougherty · 9 years ago
  72. 4a49791 Merge "Add VrManager AIDL interface for use by system apps." into nyc-dev am: 50e229f by Ruben Brunk · 9 years ago
  73. bc783e0 Merge "Add VrManager AIDL interface for use by system apps." into nyc-dev by Ruben Brunk · 9 years ago
  74. c7be3be Add VrManager AIDL interface for use by system apps. by Ruben Brunk · 9 years ago
  75. a5060ee Merge branch 'mnc-mr-docs' into mnc-ub-dev by Trevor Johns · 9 years ago
  76. 0fb0731 Delete ITelephonyDebug and ITelephonyDebugSubscriber by Pavel Zhamaitsiak · 9 years ago
  77. 60aa108 Merge "resolve merge conflicts of 20ebbb3 to nyc-dev" into nyc-dev am: f8565cd by Pavel Zhamaitsiak · 9 years ago
  78. faa0492 Merge "resolve merge conflicts of 20ebbb3 to nyc-dev" into nyc-dev am: f8565cd by Pavel Zhamaitsiak · 9 years ago
  79. ce13079 resolve merge conflicts of 20ebbb3 to nyc-dev by Pavel Zhamaitsiak · 9 years ago
  80. 20ebbb3 Merge "ConnectivityMetricsLogger: Switch to "pull" model" into mm-wireless-dev by Pavel Zhamaitsiak · 9 years ago
  81. d1cb256 ConnectivityMetricsLogger: Switch to "pull" model by Pavel Zhamaitsiak · 9 years ago
  82. 292dbde Merge "Merge commit \'1a510a3c5ce1a7d8ef9817ad7da4b06b9844383f\' into manual_merge_1a510a3" into nyc-dev-plus-aosp by Ying Wang · 9 years ago
  83. c2f612e Merge commit '1a510a3c5ce1a7d8ef9817ad7da4b06b9844383f' into manual_merge_1a510a3 by Ying Wang · 9 years ago
  84. ddea724 Merge "Add the print service recommendation service" into nyc-dev am: 740a5f0 by Philip P. Moltmann · 9 years ago
  85. fa04bc7 Merge "Add the print service recommendation service" into nyc-dev am: 740a5f0 by Philip P. Moltmann · 9 years ago
  86. 9dcb86a Add the print service recommendation service by Philip P. Moltmann · 9 years ago
  87. ba068f4 Remove support of disabling Jack. by Ying Wang · 9 years ago
  88. df1f2c5 Merge "Refactor ProcessStats." into nyc-dev am: 0caf007 am: ee93672 by Joe Onorato · 9 years ago
  89. ee93672 Merge "Refactor ProcessStats." into nyc-dev am: 0caf007 by Joe Onorato · 9 years ago
  90. 0caf007 Merge "Refactor ProcessStats." into nyc-dev by Joe Onorato · 9 years ago
  91. 3c664a9 Update PRE_BOOT_COMPLETED for FBE. am: bd91e2f am: bef5aad by Jeff Sharkey · 9 years ago
  92. bef5aad Update PRE_BOOT_COMPLETED for FBE. am: bd91e2f by Jeff Sharkey · 9 years ago
  93. bd91e2f Update PRE_BOOT_COMPLETED for FBE. by Jeff Sharkey · 9 years ago
  94. 4eb64fd Refactor ProcessStats. by Joe Onorato · 9 years ago
  95. cceedf7 resolve merge conflicts of 8416096 to nyc-dev-plus-aosp am: dc3b852 by Dan Willemsen · 9 years ago
  96. dc3b852 resolve merge conflicts of 8416096 to nyc-dev-plus-aosp by Dan Willemsen · 9 years ago
  97. 98ff0b7 Remove custom copy rules, stop using ACP by Dan Willemsen · 9 years ago
  98. 6c254f0 Merge "switch offline docs back to standard templates that now have a condition for \'referenceonly\' bug: 27667787" into nyc-dev am: 1dd114e by smain@google.com · 9 years ago
  99. 1dd114e Merge "switch offline docs back to standard templates that now have a condition for 'referenceonly' bug: 27667787" into nyc-dev by Scott Main · 9 years ago
  100. f7b6dad switch offline docs back to standard templates that now have a condition for 'referenceonly' by smain@google.com · 9 years ago