Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / f5af4a344e086efa87740a0154cace064465fe54 / Android.mk
  1. 6d0edba Merge "Fix missing dependency on R.java" am: 227a176508 am: bfd4422060 am: 0903ecb99b by Colin Cross · 8 years ago
  2. cdd5f65 Merge "Fix missing dependency on R.java" am: 227a176508 am: bfd4422060 by Colin Cross · 8 years ago
  3. 0903ecb Merge "Fix missing dependency on R.java" am: 227a176508 am: bfd4422060 by Colin Cross · 8 years ago
  4. 2dd2fea Merge "Separate advertiser from GATT client (1/4)" am: 5f87c4539a am: 40a16ea242 am: 9f341e4e49 by Jakub Pawlowski · 8 years ago
  5. bf7ab6a resolve merge conflicts of e8a3ea8 to nyc-mr1-dev-plus-aosp am: 151833ab14 by smain@google.com · 8 years ago
  6. c558dd9 Fix missing dependency on R.java by Colin Cross · 8 years ago
  7. 8348bd2 Merge "Separate advertiser from GATT client (1/4)" am: 5f87c4539a am: 40a16ea242 by Jakub Pawlowski · 8 years ago
  8. 9f341e4 Merge "Separate advertiser from GATT client (1/4)" am: 5f87c4539a am: 40a16ea242 by Jakub Pawlowski · 8 years ago
  9. 151833a resolve merge conflicts of e8a3ea8 to nyc-mr1-dev-plus-aosp by smain@google.com · 8 years ago
  10. a480f7f Separate advertiser from GATT client (1/4) by Jakub Pawlowski · 8 years ago
  11. c9ec419 replace the N Preview landing page with the redirect to the package index also update version metadata (no longer preview, now 7.0) by smain@google.com · 8 years ago
  12. dde8deb replace the N Preview landing page with the redirect to the package index by smain@google.com · 8 years ago
  13. 722de5f DO NOT MERGE Manually merge commit 'f28778064383821ccf48c9570191f34a24aa513f' into nyc-mr1-dev-plus-aosp by Mitchell Wills · 8 years ago
  14. f287780 Manually merge commit 'b0b6afc' into nyc-dev-plus-aosp by The Android Automerger · 8 years ago
  15. 357773a Merge "Add KeyAttestationApplicationIdProviderService to SystemServer" by TreeHugger Robot · 8 years ago
  16. 00abb43 [NAN] Renamed listeners to callback per API guidelines by Etan Cohen · 9 years ago
  17. b29bbcc [NAN]: API update - consolidate Puslish|Subscribe Data+Subscribe -> Config by Etan Cohen · 9 years ago
  18. 8ff1e19 Add KeyAttestationApplicationIdProviderService to SystemServer by Janis Danisevskis · 8 years ago
  19. a4a2358 dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links. am: b042ab1eb6 am: d66ec65b77 am: 7e7ea76356 by Dirk Dougherty · 8 years ago
  20. 1d7e5a69 dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links. by Dirk Dougherty · 8 years ago
  21. c05521b dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links. am: b042ab1eb6 am: d66ec65b77 by Dirk Dougherty · 8 years ago
  22. d66ec65 dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links. by Dirk Dougherty · 8 years ago
  23. b042ab1 dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links. by Dirk Dougherty · 8 years ago
  24. 8d69e9c Move EphemeralResolverService am: 31b95e0265 am: fa67fad84e am: 8c073e0aad by Todd Kennedy · 8 years ago
  25. 8c073e0 Move EphemeralResolverService am: 31b95e0265 am: fa67fad84e by Todd Kennedy · 8 years ago
  26. 31b95e0 Move EphemeralResolverService by Todd Kennedy · 8 years ago
  27. 3b2a713 Merge \\\"update the version number used in docs and update the offline docs landing page\\\" into nyc-dev am: 6623f4177c am: 38b71c5741 by smain@google.com · 8 years ago
  28. 5eac2b0 Merge \\"update the version number used in docs and update the offline docs landing page\\" into nyc-dev am: 6623f4177c by Scott Main · 8 years ago
  29. 38b71c5 Merge \"update the version number used in docs and update the offline docs landing page\" into nyc-dev by smain@google.com · 8 years ago
  30. e8c3590 Merge \"update the version number used in docs and update the offline docs landing page\" into nyc-dev by smain@google.com · 8 years ago
  31. 39426fd update the version number used in docs and update the offline docs landing page by smain@google.com · 8 years ago
  32. d1c50f6 resolve merge conflicts of 6e57aae to master by Selim Cinek · 8 years ago
  33. 6e57aae Merge \"Improve initial unlock delay (1/2)\" into nyc-mr1-dev am: 165b011a74 by Jorim Jaggi · 8 years ago
  34. e8fde5d Improve initial unlock delay (1/2) by Jorim Jaggi · 8 years ago
  35. 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
  36. 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
  37. 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
  38. f83ada9 Merge \\"Add callbacks to VoiceInteractionManagerService\\" into nyc-mr1-dev am: d58f07f58a by Annie Chin · 8 years ago
  39. d992523 Merge \"Add callbacks to VoiceInteractionManagerService\" into nyc-mr1-dev by Annie Chin · 8 years ago
  40. d58f07f Merge "Add callbacks to VoiceInteractionManagerService" into nyc-mr1-dev by Annie Chin · 8 years ago
  41. 68d9896 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
  42. c179797 Merge \\"[net mgmt svc] add method to retrieve INetd reference\\" into nyc-mr1-dev am: 58ef88927d by Erik Kline · 8 years ago
  43. e62b36b Merge \"[net mgmt svc] add method to retrieve INetd reference\" into nyc-mr1-dev by Erik Kline · 8 years ago
  44. 4e37b70 [net mgmt svc] add method to retrieve INetd reference by Erik Kline · 8 years ago
  45. ecb9f3e Add callbacks to VoiceInteractionManagerService by Annie Chin · 8 years ago
  46. 8562ab5 remove "referenceonly" flag from the offline-docs build. by smain@google.com · 8 years ago
  47. 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
  48. b216e80 Merge \\"Add a flag to enable instrumentation of the framework classes.\\" into nyc-dev am: 15783f0073 by Allen Hair · 8 years ago
  49. fb9d75e Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev by Allen Hair · 8 years ago
  50. fb20170 Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev by Allen Hair · 8 years ago
  51. 0e4f014 Add a flag to enable instrumentation of the framework classes. by Allen Hair · 8 years ago
  52. bf055ba Merge \\"Add InputMethodService#exposeContent()\\" into nyc-mr1-dev am: dc42d7dd13 by Yohei Yukawa · 8 years ago
  53. d02470f Merge \"Add InputMethodService#exposeContent()\" into nyc-mr1-dev am: dc42d7dd13 by Yohei Yukawa · 8 years ago
  54. 25e0813 Add InputMethodService#exposeContent() by Yohei Yukawa · 8 years ago
  55. 4926ee1 Merge \\\"Docs: Suppress errors in SystemApi Build Bug: 28427390\\\" into nyc-dev am: d06520a488 am: b7181150c4 by Gina Dimino · 8 years ago
  56. cb08f68 Merge \\"Docs: Suppress errors in SystemApi Build Bug: 28427390\\" into nyc-dev am: d06520a488 by Gina Dimino · 8 years ago
  57. b718115 Merge \"Docs: Suppress errors in SystemApi Build Bug: 28427390\" into nyc-dev by Gina Dimino · 8 years ago
  58. 0bae4dc Merge \"Docs: Suppress errors in SystemApi Build Bug: 28427390\" into nyc-dev by Gina Dimino · 8 years ago
  59. d06520a Merge "Docs: Suppress errors in SystemApi Build Bug: 28427390" into nyc-dev by Gina Dimino · 8 years ago
  60. 8930555 Merge \\\"Add API 24 to reference selector.\\\" into nyc-dev am: 398d088871 am: f44feb36b0 by Dirk Dougherty · 8 years ago
  61. f992a2a Merge \\"Add API 24 to reference selector.\\" into nyc-dev am: 398d088871 by Dirk Dougherty · 8 years ago
  62. f44feb3 Merge \"Add API 24 to reference selector.\" into nyc-dev am: 398d088871 by Dirk Dougherty · 8 years ago
  63. 8d129ef Merge \"Add API 24 to reference selector.\" into nyc-dev am: 398d088871 by Dirk Dougherty · 8 years ago
  64. 5f60f7c Add API 24 to reference selector. by Dirk Dougherty · 8 years ago
  65. 57ea9d0 Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev am: 6a5c9560a3 by Robert Greenwalt · 8 years ago
  66. c4e25b2 Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev am: 6a5c9560a3 by Robert Greenwalt · 8 years ago
  67. 37409c5 Add support for UNSOL PCO Data. by Robert Greenwalt · 8 years ago
  68. 98ad888 Docs: Suppress errors in SystemApi Build Bug: 28427390 by Gina Dimino · 8 years ago
  69. 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 · 8 years ago
  70. 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 · 8 years ago
  71. 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 · 8 years ago
  72. c25a9b0 Merge "Pass -yaml to ds builds to generate _book.yaml version of reference TOC." into mnc-mr-docs am: 5d8d511264 by Dirk Dougherty · 8 years ago
  73. dfa366d Pass -yaml to ds builds to generate _book.yaml version of reference TOC. by Dirk Dougherty · 8 years ago
  74. 53e7852 Merge "Fix API review comments, add remove callback." into nyc-dev am: d19191d am: 1b65983 by Martijn Coenen · 8 years ago
  75. 1b65983 Merge "Fix API review comments, add remove callback." into nyc-dev am: d19191d by Martijn Coenen · 8 years ago
  76. d19191d Merge "Fix API review comments, add remove callback." into nyc-dev by Martijn Coenen · 8 years ago
  77. 750ccd5 Manually merge branch 'nyc-mr1-dev-plus-aosp' to shortcircuit automerger b/28407115 by The Android Automerger · 8 years ago
  78. a2fcd05 Merge "resolve merge conflicts of 0d00d28 to nyc-dev" into nyc-dev am: 58a252d by Dirk Dougherty · 8 years ago
  79. d9036ba resolve merge conflicts of 0d00d28 to nyc-dev by Dirk Dougherty · 8 years ago
  80. db2174dc Merge "Ensure local settings caches are not stale" into nyc-dev am: f71d7fe am: d4bc15b by Svet Ganov · 8 years ago
  81. d4bc15b Merge "Ensure local settings caches are not stale" into nyc-dev am: f71d7fe by Svet Ganov · 8 years ago
  82. f71d7fe Merge "Ensure local settings caches are not stale" into nyc-dev by Svetoslav Ganov · 8 years ago
  83. 53a441c Ensure local settings caches are not stale by Svet Ganov · 8 years ago
  84. 0d00d28 Merge "Adjust root path for translated content dirs on devsite builds." into mnc-mr-docs am: face65fe16 by Dirk Dougherty · 8 years ago
  85. 879f5ba Merge "Cleanup of the PackageInstaller API - Frameworks" into nyc-dev am: c947ebd am: 70d720c by Svet Ganov · 8 years ago
  86. 70d720ca Merge "Cleanup of the PackageInstaller API - Frameworks" into nyc-dev by Svet Ganov · 8 years ago
  87. fa5a632 Merge "Unbundle RemoteService on TV - part 3" into nyc-dev am: 7981e8f am: a2262b3 by Sujith Ramakrishnan · 8 years ago
  88. ae0e03a Cleanup of the PackageInstaller API - Frameworks by Svet Ganov · 8 years ago
  89. c5826ee Merge "Unbundle RemoteService on TV - part 3" into nyc-dev am: 7981e8f by Sujith Ramakrishnan · 8 years ago
  90. de3f4ae Merge "Unbundle RemoteService on TV - part 3" into nyc-dev am: 7981e8f by Sujith Ramakrishnan · 8 years ago
  91. b5b86c1 Unbundle RemoteService on TV - part 3 by Sujith Ramakrishnan · 9 years ago
  92. 4465add Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev am: 729c640cc8 am: 45b1e14468 by Vladislav Kaznacheev · 8 years ago
  93. 45b1e14 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev by Vladislav Kaznacheev · 8 years ago
  94. 729c640 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev by Vladislav Kaznacheev · 8 years ago
  95. 377c328 Rename DropPermissions to DragAndDropPermissions by Vladislav Kaznacheev · 8 years ago
  96. e1ee098 Merge "Move UidRange aidl declaration to system/netd" into nyc-dev am: c618468 am: e7c7d77 by Robin Lee · 8 years ago
  97. e7c7d77 Merge "Move UidRange aidl declaration to system/netd" into nyc-dev am: c618468 by Robin Lee · 8 years ago
  98. c618468 Merge "Move UidRange aidl declaration to system/netd" into nyc-dev by Robin Lee · 8 years ago
  99. 1060694 Move UidRange aidl declaration to system/netd by Robin Lee · 8 years ago
  100. d55def8 Fix API review comments, add remove callback. by Martijn Coenen · 8 years ago