1. 89f2a51 Merge "Update the max height/width attribute of the TwoTargetPreference icon." by Doris Ling · 7 years ago
  2. 490007f Merge "Add strings for a "Tethering hardware acceleration" setting." into oc-dr1-dev am: cf694adee3 by Lorenzo Colitti · 7 years ago
  3. 0c385eb Merge "Add strings for a "Tethering hardware acceleration" setting." into oc-dr1-dev by Lorenzo Colitti · 7 years ago
  4. a990b5d Update the max height/width attribute of the TwoTargetPreference icon. by Doris Ling · 7 years ago
  5. 66dfbfa Add strings for a "Tethering hardware acceleration" setting. by Lorenzo Colitti · 7 years ago
  6. 919dc27 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  7. d94ea8f Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  8. 0e08fef Merge "Add strings for battery level info of connected devices" into oc-dr1-dev am: e269956acb by Jack He · 7 years ago
  9. 4429f9a Merge "Add strings for battery level info of connected devices" into oc-dr1-dev by Jack He · 7 years ago
  10. 0e16a86 Add strings for battery level info of connected devices by Jack He · 7 years ago
  11. 18a4a53 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  12. 603c205 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  13. d5df945 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  14. 2734550 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  15. 97f536f Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  16. 793f69e Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  17. c0639ff Merge "BT device renaming: move edit icon and add metrics proto" into oc-dr1-dev am: a4c07d7c09 by Antony Sargent · 7 years ago
  18. 416b76b Merge "BT device renaming: move edit icon and add metrics proto" into oc-dr1-dev by Antony Sargent · 7 years ago
  19. c3b5da6 BT device renaming: move edit icon and add metrics proto by Antony Sargent · 7 years ago
  20. 47a59bf Merge "Add right padding to two target preference text area" into oc-dr1-dev am: a96ba2d88c by Fan Zhang · 7 years ago
  21. fff3b21 Merge "Add right padding to two target preference text area" into oc-dr1-dev by Fan Zhang · 7 years ago
  22. a96ba2d Merge "Add right padding to two target preference text area" into oc-dr1-dev by TreeHugger Robot · 7 years ago
  23. 1e8c673 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev by TreeHugger Robot · 7 years ago
  24. d6cc828 Merge "Import translations. DO NOT MERGE" by TreeHugger Robot · 7 years ago
  25. 14bfbca Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  26. 76c01b7 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  27. 24bdb2b Merge "Bluetooth: Change keyboard icon to normal system color" into oc-dr1-dev am: a0c6ea0eaa by Jack He · 7 years ago
  28. 7136ec2 Merge "Bluetooth: Change keyboard icon to normal system color" into oc-dr1-dev by Jack He · 7 years ago
  29. 75a6f44 Add right padding to two target preference text area by Fan Zhang · 7 years ago
  30. 0d61183 Bluetooth: Change keyboard icon to normal system color by Jack He · 7 years ago
  31. 996a9b4 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  32. 1473ca9 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  33. 115afb7 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  34. 09c9543 Merge "Add strings for improving Wifi wrong password UX" by TreeHugger Robot · 7 years ago
  35. e1caa9e Add strings for improving Wifi wrong password UX by Antony Sargent · 7 years ago
  36. e8853f5 Fix "OK" speed label string. by Sundeep Ghuman · 7 years ago
  37. b435250 Merge "Move UsageGraph from SettingsLib to Settings." by TreeHugger Robot · 7 years ago
  38. 97985db Merge "Copy layout file of preference category from Settings." by Xiangyu/Malcolm Chen · 7 years ago
  39. 6579b8b Copy layout file of preference category from Settings. by Malcolm Chen · 7 years ago
  40. 48ba685 Merge "Misc fixes in settingslib" by TreeHugger Robot · 7 years ago
  41. 141709a Merge "Update strings related to BatteryInfo" by Lei Yu · 7 years ago
  42. 89cff1a Misc fixes in settingslib by Fan Zhang · 7 years ago
  43. a7a6b85 Merge "Import translations. DO NOT MERGE" by TreeHugger Robot · 7 years ago
  44. 67b5082 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  45. d49b6b9 Move UsageGraph from SettingsLib to Settings. by Alex Kulesza · 7 years ago
  46. 2c337cb Update strings related to BatteryInfo by jackqdyulei · 7 years ago
  47. 64080f1 Move strings to SettingsLib so TV can use them by Tony Mantler · 7 years ago
  48. 98485fc Merge "Bluetooth string changes" by TreeHugger Robot · 7 years ago
  49. 54f685a Merge "Make vertical divider darker for two_target preference" by TreeHugger Robot · 7 years ago
  50. 1d99748 Merge "Create icon layout style so custom preferences can reuse" by TreeHugger Robot · 7 years ago
  51. b666ee5 Merge "Add BottomLabelLayout for battery graph" into oc-dev am: 9e6519c7e1 by jackqdyulei · 7 years ago
  52. 4ca9c05 Merge "Add BottomLabelLayout for battery graph" into oc-dev am: 9e6519c7e1 by jackqdyulei · 7 years ago
  53. c609805 Bluetooth string changes by Antony Sargent · 7 years ago
  54. 0ae9f40 Create icon layout style so custom preferences can reuse by Fan Zhang · 7 years ago
  55. 2dfbb9d Make vertical divider darker for two_target preference by Fan Zhang · 7 years ago
  56. e1c381f Add BottomLabelLayout for battery graph by jackqdyulei · 7 years ago
  57. 3853f8d Add strings for Wifi Speed Labeling. by Sundeep Ghuman · 7 years ago
  58. 82c18b4 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  59. b4e167b Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  60. 05b5eb7 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  61. e82df3f Merge "batterymeter -> just meter." into oc-dev am: da4c81d942 am: 5c05a04448 by Daniel Nishi · 7 years ago
  62. 5c05a04 Merge "batterymeter -> just meter." into oc-dev am: da4c81d942 by Daniel Nishi · 7 years ago
  63. da4c81d Merge "batterymeter -> just meter." into oc-dev by Daniel Nishi · 7 years ago
  64. eac98cf Use channel warning development setting. am: 507822decb am: fb84cb942c by Geoffrey Pitsch · 7 years ago
  65. fb84cb9 Use channel warning development setting. am: 507822decb by Geoffrey Pitsch · 7 years ago
  66. 507822d Use channel warning development setting. by Geoffrey Pitsch · 7 years ago
  67. 425b028 Merge "Update getBatteryInfo to allow drain time override" by Salvador Martinez · 7 years ago
  68. ebf1925 Merge "Align preference text to actionbar title." into oc-dev am: eb4712d7bd by Fan Zhang · 7 years ago
  69. 9a9142f Merge "Align preference text to actionbar title." into oc-dev am: eb4712d7bd by Fan Zhang · 7 years ago
  70. a8f6ede Update getBatteryInfo to allow drain time override by Salvador Martinez · 7 years ago
  71. f434f5d Align preference text to actionbar title. by Fan Zhang · 7 years ago
  72. 154aa19 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  73. 4df82cf Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  74. 02fce52 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  75. 15643bc Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  76. 8af93cb batterymeter -> just meter. by Daniel Nishi · 7 years ago
  77. 237a725 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  78. c28ba4d Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  79. 5efe8f0 Import FooterPreferenceMixin and its dependencies into SettingsLib. by Juan Lang · 7 years ago
  80. 582a846 Merge "Import translations. DO NOT MERGE" into oc-dev by TreeHugger Robot · 7 years ago
  81. f660976 Merge "Import translations. DO NOT MERGE" by TreeHugger Robot · 7 years ago
  82. f609d9c Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  83. f2cacbe Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  84. 1d392ef Merge "Adjust icon width to match the width with framework" into oc-dev am: 7acd87d8d0 by Fan Zhang · 7 years ago
  85. 0a7dc82 Merge "Adjust icon width to match the width with framework" into oc-dev by Fan Zhang · 7 years ago
  86. 8a01abf Adjust icon width to match the width with framework by Fan Zhang · 7 years ago
  87. 5336f6e Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  88. 0c79fa9 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  89. be16098 Import translations. DO NOT MERGE by The Android Open Source Project · 7 years ago
  90. 2e12c48 Import translations. DO NOT MERGE by The Android Open Source Project · 7 years ago
  91. 93aa193 Merge "Import translations. DO NOT MERGE" by TreeHugger Robot · 7 years ago
  92. 3b0a711 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  93. de29860 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  94. 7d48be0 Reduce min height for two target prefs to match spec. by Fan Zhang · 7 years ago
  95. 14f86c1 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  96. fe34667 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  97. 74c2103 Merge "Strings for "Use high quality audio" option in Bluetooth A2DP device settings" into oc-dev am: 3036e728e7 by Antony Sargent · 7 years ago
  98. 8288594 Merge "Strings for "Use high quality audio" option in Bluetooth A2DP device settings" into oc-dev by Antony Sargent · 7 years ago
  99. 3036e72 Merge "Strings for "Use high quality audio" option in Bluetooth A2DP device settings" into oc-dev by Antony Sargent · 7 years ago
  100. f945f52 resolve merge conflicts of 23f196f347b7 to master by Andrew Sapperstein · 7 years ago