Gitiles
Code Review Sign In
gerrit.witaqua.org / frameworks_base / f53c7a2ae5d2ef0a36d3021305328c78fc75d44d
  1. f53c7a2 resolve merge conflicts of 7980b19bc8fa1fb0c4b4b3abea891d6e245b3edd to stage-aosp-master by Neil Fuller · 8 years ago
  2. 3147288 resolve merge conflicts of 7980b19bc8fa1fb0c4b4b3abea891d6e245b3edd to stage-aosp-master by Neil Fuller · 8 years ago
  3. 7980b19 Merge "Track changes in libcore to remove a constructor" by Treehugger Robot · 8 years ago
  4. 4fc0ab5 Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev am: cec93100ea am: 7557661787 am: 199b3ee0d8 by Bill Yi · 8 years ago
  5. 1beddd1 [automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720 am: c6d9bee144 -s ours am: bf6bbefe57 -s ours am: c1a9ad2a19 -s ours by Bill Yi · 8 years ago
  6. 6275ee5 Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev am: 72e16b1754 am: af687adf49 am: f9a749eb82 by Bill Yi · 8 years ago
  7. 611fb78 [automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168 am: a05627322f -s ours am: a8276b8de4 -s ours am: 1080ba61c3 -s ours by Bill Yi · 8 years ago
  8. 539952c Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev am: 6005492cb2 am: 851e826783 am: e2a7c24f03 by Bill Yi · 8 years ago
  9. dff3f6a [automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56 am: 8700285134 -s ours am: f2ea6f55d9 -s ours am: 9bf5cb9b7f -s ours by Bill Yi · 8 years ago
  10. 5b29095 Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev am: 37d9749e81 am: b434b0c169 am: 086abb7a59 by Bill Yi · 8 years ago
  11. 87829f5 [automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6 am: eacf5ffefb -s ours am: 67f18d810a -s ours am: d635022d93 -s ours by Bill Yi · 8 years ago
  12. 6dc5734 Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev am: cec93100ea am: 7557661787 by Bill Yi · 8 years ago
  13. 648f0b4 [automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720 am: c6d9bee144 -s ours am: bf6bbefe57 -s ours by Bill Yi · 8 years ago
  14. b5334ff Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev am: 72e16b1754 am: af687adf49 by Bill Yi · 8 years ago
  15. 0ae92cd [automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168 am: a05627322f -s ours am: a8276b8de4 -s ours by Bill Yi · 8 years ago
  16. d91868a Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev am: 6005492cb2 am: 851e826783 by Bill Yi · 8 years ago
  17. 8dfe2e7 [automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56 am: 8700285134 -s ours am: f2ea6f55d9 -s ours by Bill Yi · 8 years ago
  18. cd74671 Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev am: 37d9749e81 am: b434b0c169 by Bill Yi · 8 years ago
  19. 199b3ee Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev am: cec93100ea by Bill Yi · 8 years ago
  20. 84729fc [automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6 am: eacf5ffefb -s ours am: 67f18d810a -s ours by Bill Yi · 8 years ago
  21. c1a9ad2 [automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720 am: c6d9bee144 -s ours by Bill Yi · 8 years ago
  22. f9a749e Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev am: 72e16b1754 by Bill Yi · 8 years ago
  23. 3fab85b Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev am: c1dc805861 am: 812ec62a14 am: c3ff91a225 by Bill Yi · 8 years ago
  24. 1080ba6 [automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168 am: a05627322f -s ours by Bill Yi · 8 years ago
  25. e2a7c24 Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev am: 6005492cb2 by Bill Yi · 8 years ago
  26. 9969f29b [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1 am: 998f40e6c5 -s ours am: fcca5bb731 -s ours am: d18e450922 -s ours by Bill Yi · 8 years ago
  27. 9bf5cb9 [automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56 am: 8700285134 -s ours by Bill Yi · 8 years ago
  28. 1283566 Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev am: c1dc805861 am: 812ec62a14 by Bill Yi · 8 years ago
  29. 086abb7 Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev am: 37d9749e81 by Bill Yi · 8 years ago
  30. 8944491 [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1 am: 998f40e6c5 -s ours am: fcca5bb731 -s ours by Bill Yi · 8 years ago
  31. d635022 [automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6 am: eacf5ffefb -s ours by Bill Yi · 8 years ago
  32. c3ff91a Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev am: c1dc805861 by Bill Yi · 8 years ago
  33. d18e450 [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1 am: 998f40e6c5 -s ours by Bill Yi · 8 years ago
  34. b263a1a Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev am: ec4d649d8f am: f051b28554 am: 5d61a6618b by Bill Yi · 8 years ago
  35. 7557661 Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev by Bill Yi · 8 years ago
  36. bf6bbef [automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720 by Bill Yi · 8 years ago
  37. 64b9fb5 [automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc am: 9204ce40e4 -s ours am: e45b804b65 -s ours am: d9d9d1daca -s ours by Bill Yi · 8 years ago
  38. af687ad Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev by Bill Yi · 8 years ago
  39. a8276b8 [automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168 by Bill Yi · 8 years ago
  40. 851e826 Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev by Bill Yi · 8 years ago
  41. 4021761 Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev am: ec4d649d8f am: f051b28554 by Bill Yi · 8 years ago
  42. f2ea6f5 [automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56 by Bill Yi · 8 years ago
  43. b434b0c Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev by Bill Yi · 8 years ago
  44. 67f18d8 [automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6 by Bill Yi · 8 years ago
  45. 9f95053 [automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc am: 9204ce40e4 -s ours am: e45b804b65 -s ours by Bill Yi · 8 years ago
  46. 812ec62 Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev by Bill Yi · 8 years ago
  47. fcca5bb7 [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1 by Bill Yi · 8 years ago
  48. 4a4b554 [automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab am: b3bf111bd5 -s ours am: 4065ce8773 -s ours am: 03e1c5f227 -s ours by Bill Yi · 8 years ago
  49. 5d61a66 Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev am: ec4d649d8f by Bill Yi · 8 years ago
  50. d9d9d1d [automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc am: 9204ce40e4 -s ours by Bill Yi · 8 years ago
  51. 0596870 [automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab am: b3bf111bd5 -s ours am: 4065ce8773 -s ours by Bill Yi · 8 years ago
  52. f051b28 Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev by Bill Yi · 8 years ago
  53. 03e1c5f [automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab am: b3bf111bd5 -s ours by Bill Yi · 8 years ago
  54. e45b804 [automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc by Bill Yi · 8 years ago
  55. 4065ce8 [automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab by Bill Yi · 8 years ago
  56. cec9310 Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev by TreeHugger Robot · 8 years ago
  57. 72e16b1 Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev by TreeHugger Robot · 8 years ago
  58. 6005492 Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev by TreeHugger Robot · 8 years ago
  59. 37d9749 Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev by TreeHugger Robot · 8 years ago
  60. c1dc805 Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev by TreeHugger Robot · 8 years ago
  61. ec4d649 Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev by TreeHugger Robot · 8 years ago
  62. a056273 [automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168 by Android Build Merger (Role) · 8 years ago
  63. 39c48a1 [automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae by Android Build Merger (Role) · 8 years ago
  64. e35f1fd Import translations. DO NOT MERGE by Bill Yi · 8 years ago
  65. 9204ce4 [automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc by Android Build Merger (Role) · 8 years ago
  66. f028c34 [automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 by Android Build Merger (Role) · 8 years ago
  67. cd4aea6 Import translations. DO NOT MERGE by Bill Yi · 8 years ago
  68. 998f40e [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1 by Android Build Merger (Role) · 8 years ago
  69. 8062f29 [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec by Android Build Merger (Role) · 8 years ago
  70. 32c0874 Import translations. DO NOT MERGE by Bill Yi · 8 years ago
  71. eacf5ff [automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6 by Android Build Merger (Role) · 8 years ago
  72. ace44c1 [automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d by Android Build Merger (Role) · 8 years ago
  73. f02d296 Import translations. DO NOT MERGE by Bill Yi · 8 years ago
  74. 8700285 [automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56 by Android Build Merger (Role) · 8 years ago
  75. 4740838 [automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 by Android Build Merger (Role) · 8 years ago
  76. ff2f705 Import translations. DO NOT MERGE by Bill Yi · 8 years ago
  77. b3bf111 [automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab by Android Build Merger (Role) · 8 years ago
  78. b586d4e [automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 by Android Build Merger (Role) · 8 years ago
  79. f8ecf21 Import translations. DO NOT MERGE by Bill Yi · 8 years ago
  80. c6d9bee [automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720 by Android Build Merger (Role) · 8 years ago
  81. 33cf864 [automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e by Android Build Merger (Role) · 8 years ago
  82. c28b092 Import translations. DO NOT MERGE by Bill Yi · 8 years ago
  83. ee2bfdd Merge "Remove unusual static method call" am: cbe9c295a3 am: 36beeefc84 by Neil Fuller · 8 years ago
  84. ed6cc29 Merge "Always close file descriptors" am: 26025a06ec am: de8eac9ae1 by Erik Kline · 8 years ago
  85. 9ca5d6f Merge "Track constructor changes in libcore/" am: f94eb29500 am: 67dcf6da3c by Neil Fuller · 8 years ago
  86. 36beeef Merge "Remove unusual static method call" am: cbe9c295a3 by Neil Fuller · 8 years ago
  87. de8eac9 Merge "Always close file descriptors" am: 26025a06ec by Erik Kline · 8 years ago
  88. 67dcf6d Merge "Track constructor changes in libcore/" am: f94eb29500 by Neil Fuller · 8 years ago
  89. cbe9c29 Merge "Remove unusual static method call" by Treehugger Robot · 8 years ago
  90. 9c610f7 Remove unusual static method call by Neil Fuller · 8 years ago
  91. 26025a0 Merge "Always close file descriptors" by Treehugger Robot · 8 years ago
  92. f94eb29 Merge "Track constructor changes in libcore/" by Neil Fuller · 8 years ago
  93. 725e8f6 Always close file descriptors by Erik Kline · 8 years ago
  94. 2fd79e4 [automerger skipped] Import translations. DO NOT MERGE am: 3f4b3c946d -s ours by Bill Yi · 8 years ago
  95. 06cec22 Merge "Fix the logic to get tv_pip_settings_class_name" am: d004710e0e by Shuichi.Noguchi · 8 years ago
  96. 08923b7 Merge "Fix the logic to get tv_pip_settings_class_name" am: d004710e0e by Shuichi.Noguchi · 8 years ago
  97. 3f4b3c9 Import translations. DO NOT MERGE by Bill Yi · 8 years ago
  98. d004710 Merge "Fix the logic to get tv_pip_settings_class_name" by Treehugger Robot · 8 years ago
  99. baae7fa Track changes in libcore to remove a constructor by Neil Fuller · 8 years ago
  100. 5d8e53c Merge "DO NOT MERGE: Delay brightness change" into pi-dev am: 0937d1807b by Lucas Dupin · 8 years ago