Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / df255a4a6b3dfbde4a8fc16279faa5d998f8eb6d
  1. df255a4 Merge "OutputConfiguration: Fix missing mIsShared in parcel read" into oc-dev by Shuzhen Wang · 6 years ago
  2. 5f7cdba Merge "OutputConfiguration: Fix missing mIsShared in parcel read" into oc-dev by TreeHugger Robot · 6 years ago
  3. 8289005 [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 41ee2787b4 -s ours skipped: 705235ca51 by Android Build Merger (Role) · 7 years ago
  4. dba446b [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 407d338837 -s ours skipped: 6ad3912399 by Android Build Merger (Role) · 7 years ago
  5. f03288d [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 16b6bdf5a5 -s ours skipped: 03ed0985ef by Android Build Merger (Role) · 7 years ago
  6. dbbffc9 Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1d77757fb5 -s ours" into nyc-mr2-dev am: a22445abae -s ours" into oc-dev by Android Build Merger (Role) · 7 years ago
  7. abad959 [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 28815c5b0e -s ours skipped: 0534420c5d by Android Build Merger (Role) · 7 years ago
  8. 6981d14 Merge "Merge changes from topic "am-cfa86bae-47ed-4c92-b3ac-8400ba6eb201" into nyc-mr2-dev am: 2d947206f7" into oc-dev by Android Build Merger (Role) · 7 years ago
  9. 77803cc [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: d6df52e22f -s ours skipped: 7f649e7e6d by Android Build Merger (Role) · 7 years ago
  10. 02ee278 [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1d77757fb5 -s ours skipped: d855899adb by Android Build Merger (Role) · 7 years ago
  11. e72f06b Merge changes from topic "am-cfa86bae-47ed-4c92-b3ac-8400ba6eb201" into oc-dev by Android Build Merger (Role) · 7 years ago
  12. f19c7ab [automerger skipped] Import translations. DO NOT MERGE skipped: 4f9f892582 skipped: 1a68c01ae5 by Android Build Merger (Role) · 7 years ago
  13. bf2ee3c [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0fa3646a34 -s ours skipped: d6eb3dbf4b by Android Build Merger (Role) · 7 years ago
  14. f1d0f96 Merge changes from topic "am-8df06f4c-7127-41db-a6a2-64c67bb75497" into oc-dev by Android Build Merger (Role) · 7 years ago
  15. f12ba9f [automerger skipped] Import translations. DO NOT MERGE skipped: aa7eca2f03 skipped: ccc16f92d7 by Android Build Merger (Role) · 7 years ago
  16. 9393133 Merge changes from topic "am-8df3bdfc-9f3c-40b2-b051-5cc0120da88b" into oc-dev by Android Build Merger (Role) · 7 years ago
  17. 8a35a13 [automerger skipped] Import translations. DO NOT MERGE skipped: 816ddbdba7 skipped: e0e084e199 by Android Build Merger (Role) · 7 years ago
  18. 0fe9007 Merge changes from topic "am-37557a04-fa85-46fe-a499-4a0280811f3e" into oc-dev by Android Build Merger (Role) · 7 years ago
  19. 4dfc160 [automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb skipped: 2e4c69a707 by Android Build Merger (Role) · 7 years ago
  20. 94b7faf Merge changes from topic "am-6a9a8997-43fc-40a2-827f-5f1c575c8748" into oc-dev by Android Build Merger (Role) · 7 years ago
  21. a8e2306 [automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18 skipped: 218841a6dd by Android Build Merger (Role) · 7 years ago
  22. e15cb62 [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 41ee2787b4 -s ours skipped: 705235ca51 by Android Build Merger (Role) · 7 years ago
  23. 705235c Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 41ee2787b4 -s ours by Bill Yi · 7 years ago
  24. 7e0d93a6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 407d338837 -s ours skipped: 6ad3912399 by Android Build Merger (Role) · 7 years ago
  25. 981bc5a Merge changes from topic "am-459a2298-9d91-42be-bcee-e19446619a42" into oc-dev by Android Build Merger (Role) · 7 years ago
  26. 6ad3912 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 407d338837 -s ours by Bill Yi · 7 years ago
  27. cd4371f [automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 skipped: 03130e4fbb by Android Build Merger (Role) · 7 years ago
  28. 0e2501d [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 16b6bdf5a5 -s ours skipped: 03ed0985ef by Android Build Merger (Role) · 7 years ago
  29. 03ed098 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 16b6bdf5a5 -s ours by Bill Yi · 7 years ago
  30. dbdfba9 Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1d77757fb5 -s ours" into nyc-mr2-dev am: a22445abae -s ours" into oc-dev by Android Build Merger (Role) · 7 years ago
  31. 619a703 Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1d77757fb5 -s ours" into nyc-mr2-dev by Android Build Merger (Role) · 7 years ago
  32. 6866408 [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 28815c5b0e -s ours skipped: 0534420c5d by Android Build Merger (Role) · 7 years ago
  33. 0534420 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 28815c5b0e -s ours by Bill Yi · 7 years ago
  34. 066be5e Merge "Merge changes from topic "am-cfa86bae-47ed-4c92-b3ac-8400ba6eb201" into nyc-mr2-dev am: 2d947206f7" into oc-dev by Android Build Merger (Role) · 7 years ago
  35. 77740c0 Merge changes from topic "am-cfa86bae-47ed-4c92-b3ac-8400ba6eb201" into nyc-mr2-dev by Android Build Merger (Role) · 7 years ago
  36. 5cd6875 [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: d6df52e22f -s ours skipped: 7f649e7e6d by Android Build Merger (Role) · 7 years ago
  37. 7f649e7 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: d6df52e22f -s ours by Bill Yi · 7 years ago
  38. 6c1ecb9 Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into oc-dev by Android Build Merger (Role) · 7 years ago
  39. 114cd10 [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped: 10f8c984c0 by Android Build Merger (Role) · 7 years ago
  40. a22445a Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1d77757fb5 -s ours" into nyc-mr2-dev by Android Build Merger (Role) · 7 years ago
  41. 350fc5d [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1d77757fb5 -s ours skipped: d855899adb by Android Build Merger (Role) · 7 years ago
  42. d855899 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1d77757fb5 -s ours by Bill Yi · 7 years ago
  43. 11c37d0 Merge changes from topic "am-cfa86bae-47ed-4c92-b3ac-8400ba6eb201" into oc-dev by TreeHugger Robot · 7 years ago
  44. 41ee278 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  45. 2d94720 Merge changes from topic "am-cfa86bae-47ed-4c92-b3ac-8400ba6eb201" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  46. fa70de8 [automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 skipped: a14fb25f93 by Android Build Merger (Role) · 7 years ago
  47. fb8b2af Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0fa3646a34 -s ours" into nyc-mr2-dev by Android Build Merger (Role) · 7 years ago
  48. 7b9a09d [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0fa3646a34 -s ours skipped: d6eb3dbf4b by Android Build Merger (Role) · 7 years ago
  49. 6367f81 Merge changes from topic "am-8df06f4c-7127-41db-a6a2-64c67bb75497" into oc-dev by TreeHugger Robot · 7 years ago
  50. 407d338 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  51. 84e21f34 Merge changes from topic "am-8df06f4c-7127-41db-a6a2-64c67bb75497" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  52. d6eb3db Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0fa3646a34 -s ours by Bill Yi · 7 years ago
  53. eb9a92f Merge changes from topic "am-8df3bdfc-9f3c-40b2-b051-5cc0120da88b" into oc-dev by TreeHugger Robot · 7 years ago
  54. 16b6bdf Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  55. 6a445d1 Merge changes from topic "am-8df3bdfc-9f3c-40b2-b051-5cc0120da88b" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  56. bcf3392 Merge changes from topic "am-37557a04-fa85-46fe-a499-4a0280811f3e" into oc-dev by TreeHugger Robot · 7 years ago
  57. 28815c5 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  58. c6762c9 Merge changes from topic "am-37557a04-fa85-46fe-a499-4a0280811f3e" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  59. f310c79 Merge changes from topic "am-6a9a8997-43fc-40a2-827f-5f1c575c8748" into oc-dev by TreeHugger Robot · 7 years ago
  60. d6df52e Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  61. 69ef1eb Merge changes from topic "am-6a9a8997-43fc-40a2-827f-5f1c575c8748" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  62. 806b457 Merge changes from topic "am-459a2298-9d91-42be-bcee-e19446619a42" into oc-dev by TreeHugger Robot · 7 years ago
  63. 1d77757 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  64. c69c4e5 Merge changes from topic "am-459a2298-9d91-42be-bcee-e19446619a42" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  65. 41ae4b7 Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into oc-dev by TreeHugger Robot · 7 years ago
  66. 0fa3646 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  67. a0276bf Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  68. d7b199b [automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb skipped: 2e4c69a707 by Android Build Merger (Role) · 7 years ago
  69. 2e4c69a [automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb by Android Build Merger (Role) · 7 years ago
  70. 39a33e2 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  71. 77243e2 [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped: 10f8c984c0 by Android Build Merger (Role) · 7 years ago
  72. 10f8c98 [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb by Android Build Merger (Role) · 7 years ago
  73. 9a738ccc Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  74. a9d6432 [automerger skipped] Import translations. DO NOT MERGE skipped: 816ddbdba7 skipped: e0e084e199 by Android Build Merger (Role) · 7 years ago
  75. e0e084e [automerger skipped] Import translations. DO NOT MERGE skipped: 816ddbdba7 by Android Build Merger (Role) · 7 years ago
  76. 816ddbd Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  77. 387047a [automerger skipped] Import translations. DO NOT MERGE skipped: aa7eca2f03 skipped: ccc16f92d7 by Android Build Merger (Role) · 7 years ago
  78. ccc16f9 [automerger skipped] Import translations. DO NOT MERGE skipped: aa7eca2f03 by Android Build Merger (Role) · 7 years ago
  79. aa7eca2 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  80. 0a09cd4 [automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 skipped: 03130e4fbb by Android Build Merger (Role) · 7 years ago
  81. 03130e4 [automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 by Android Build Merger (Role) · 7 years ago
  82. 4cd0777 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  83. 6f59280 [automerger skipped] Import translations. DO NOT MERGE skipped: 4f9f892582 skipped: 1a68c01ae5 by Android Build Merger (Role) · 7 years ago
  84. 1a68c01 [automerger skipped] Import translations. DO NOT MERGE skipped: 4f9f892582 by Android Build Merger (Role) · 7 years ago
  85. 4f9f892 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  86. 8eb39fb [automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18 skipped: 218841a6dd by Android Build Merger (Role) · 7 years ago
  87. 218841a [automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18 by Android Build Merger (Role) · 7 years ago
  88. 2c3e611 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  89. 19f0813 [automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 skipped: a14fb25f93 by Android Build Merger (Role) · 7 years ago
  90. a14fb25 [automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 by Android Build Merger (Role) · 7 years ago
  91. e34cac0 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  92. 9b90490 [automerger skipped] RESTRICT AUTOMERGE Preventing recursive referrence in drawables skipped: cee125012a by Android Build Merger (Role) · 7 years ago
  93. cee1250 RESTRICT AUTOMERGE Preventing recursive referrence in drawables by Sunny Goyal · 7 years ago
  94. 69d240d Merge "Wrap StackOverflowError in NotFoundException. Bug: 67462465 Bug: 66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev by Hyunyoung Song · 7 years ago
  95. 48df033 Merge "Wrap StackOverflowError in NotFoundException. Bug: 67462465 Bug: 66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev by TreeHugger Robot · 7 years ago
  96. 800e061 Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of binding and connecting to services. by Kevin Hufnagle · 7 years ago
  97. d195a99 Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e by Kevin Hufnagle · 7 years ago
  98. 3a8be1a Merge "Import translations. DO NOT MERGE" into oc-dr1-dev by TreeHugger Robot · 7 years ago
  99. f0687d1 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f -s ours am: 0a1948e515 -s ours by Bill Yi · 7 years ago
  100. 7cb6513 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f -s ours by Bill Yi · 7 years ago