1. e64e304 Merge "Signal init when user 0 CE storage is unlocked" into oc-dr1-dev am: f43054df6b by Paul Crowley · 8 years ago
  2. 3d5e376 Merge "Signal init when user 0 CE storage is unlocked" into oc-dr1-dev by Paul Crowley · 8 years ago
  3. d0abca5 Merge "Added haptic feedback for longpressing." into oc-dr1-dev am: 8a3ccb11a0 by Selim Cinek · 8 years ago
  4. f43054d Merge "Signal init when user 0 CE storage is unlocked" into oc-dr1-dev by TreeHugger Robot · 8 years ago
  5. 6ef4368 Merge "Added haptic feedback for longpressing." into oc-dr1-dev am: 8a3ccb11a0 by Selim Cinek · 8 years ago
  6. 9f95031 Merge "Added haptic feedback for longpressing." into oc-dr1-dev am: 8a3ccb11a0 by Selim Cinek · 8 years ago
  7. aed8ed7 Merge "Not reseting the last fullscreenintent time when reinflating" into oc-mr1-dev by Selim Cinek · 8 years ago
  8. 8093e38 Merge "Added haptic feedback for longpressing." into oc-dr1-dev am: 8a3ccb11a0 by Selim Cinek · 8 years ago
  9. 198d861 Merge "Improving the haptic notification experience" into oc-mr1-dev by Selim Cinek · 8 years ago
  10. fa7d4f4 Merge "Not reseting the last fullscreenintent time when reinflating" into oc-mr1-dev by Selim Cinek · 8 years ago
  11. 8a3ccb1 Merge "Added haptic feedback for longpressing." into oc-dr1-dev by Selim Cinek · 8 years ago
  12. 00c988a Merge "Improving the haptic notification experience" into oc-mr1-dev by Selim Cinek · 8 years ago
  13. 582f4d9 Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 581a166ae1 -s ours am: 603a43e5c3 -s ours am: 81a1d589ba -s ours am: 27735ae948 -s ours" into oc-dr1-dev-plus-aosp am: 946af3821e -s ours" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  14. 4946595 Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 581a166ae1 -s ours am: 603a43e5c3 -s ours am: 81a1d589ba -s ours am: 27735ae948 -s ours" into oc-dr1-dev-plus-aosp by Bill Yi · 8 years ago
  15. 2e92154 Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 581a166ae1 -s ours am: 603a43e5c3 -s ours am: 81a1d589ba -s ours am: ce64f8f63d -s ours" into oc-dr1-dev-plus-aosp am: 1be00337b8 -s ours" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  16. 0c6f099 Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 581a166ae1 -s ours am: 603a43e5c3 -s ours am: 81a1d589ba -s ours am: ce64f8f63d -s ours" into oc-dr1-dev-plus-aosp by Bill Yi · 8 years ago
  17. 297609b Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 581a166ae1 -s ours am: 603a43e5c3 -s ours am: 81a1d589ba -s ours am: 27735ae948 -s ours" into oc-mr1-dev by Bill Yi · 8 years ago
  18. 2f0c13a Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s ours am: 9cf9d294ef -s ours am: e2f2fbaea1 -s ours am: 6df138613e -s ours" into oc-mr1-dev by Bill Yi · 8 years ago
  19. 32b2b6f Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 4ba2bc4d32 -s ours am: 8080362358 -s ours am: 0ceb3853e8 -s ours am: fdcb482a98 -s ours" into oc-mr1-dev by Bill Yi · 8 years ago
  20. 5391b4c Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s ours am: 9cf9d294ef -s ours am: e2f2fbaea1 -s ours am: 6df138613e -s ours by Bill Yi · 8 years ago
  21. 685f274 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 4ba2bc4d32 -s ours am: 8080362358 -s ours am: 0ceb3853e8 -s ours am: fdcb482a98 -s ours by Bill Yi · 8 years ago
  22. c015001 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103 -s ours am: 995029b529 -s ours am: 1e8ed22be2 -s ours am: 9b16c7b2bb -s ours" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  23. 88428ad Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103 -s ours am: 995029b529 -s ours am: 1e8ed22be2 -s ours by Bill Yi · 8 years ago
  24. 28099da Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602 -s ours am: aec51f497c -s ours am: b57520aae6 -s ours" into oc-dr1-dev-plus-aosp am: 0b190bd9cb -s ours" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  25. cf79937 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602 -s ours am: aec51f497c -s ours am: b57520aae6 -s ours" into oc-dr1-dev-plus-aosp by Bill Yi · 8 years ago
  26. 972d146 Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s ours am: 9cf9d294ef -s ours am: e2f2fbaea1 -s ours am: f417f591a1 -s ours" into oc-dr1-dev-plus-aosp am: b99a5acab9 -s ours" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  27. 877e38f Merge "Merge "Checks if mResponses is null before using it." into oc-mr1-dev am: db3c4ee787" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  28. 747ee7f Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s ours am: 9cf9d294ef -s ours am: e2f2fbaea1 -s ours am: f417f591a1 -s ours" into oc-dr1-dev-plus-aosp by Bill Yi · 8 years ago
  29. c3337f1 Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903 -s ours am: 18b818e2dd -s ours am: 415ca774d7 -s ours" into oc-dr1-dev-plus-aosp am: 6d7c3b21e5 -s ours" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  30. 95b1029 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903 -s ours am: 18b818e2dd -s ours am: 415ca774d7 -s ours" into oc-dr1-dev-plus-aosp by Bill Yi · 8 years ago
  31. e2359f2 Merge "Checks if mResponses is null before using it." into oc-mr1-dev by Felipe Leme · 8 years ago
  32. a895be2 Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 4ba2bc4d32 -s ours am: 8080362358 -s ours am: 0ceb3853e8 -s ours am: 7395db8492 -s ours" into oc-dr1-dev-plus-aosp am: b42dbfd109 -s ours" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  33. ab27f85 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103 -s ours am: 995029b529 -s ours am: 1e8ed22be2 -s ours am: 25b5ae7884 -s ours" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  34. 9744211 Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 4ba2bc4d32 -s ours am: 8080362358 -s ours am: 0ceb3853e8 -s ours am: 7395db8492 -s ours" into oc-dr1-dev-plus-aosp by Bill Yi · 8 years ago
  35. c087fd0 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103 -s ours am: 995029b529 -s ours am: 1e8ed22be2 -s ours by Bill Yi · 8 years ago
  36. 135863e Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602 -s ours am: aec51f497c -s ours am: b57520aae6 -s ours am: aa315324f1 -s ours" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  37. 720f247 Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fbfd283125 -s ours" into nyc-mr2-dev am: cd955ca6e5 -s ours am: f66ddc099a -s ours am: b277fa8fb9 -s ours am: 9b8f58319f -s ours" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  38. 41c3adf Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 581a166ae1 -s ours am: 603a43e5c3 -s ours am: 81a1d589ba -s ours am: 27735ae948 -s ours" into oc-mr1-dev by Android Build Merger (Role) · 8 years ago
  39. 5e14de7 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602 -s ours am: aec51f497c -s ours am: b57520aae6 -s ours by Bill Yi · 8 years ago
  40. 1648de8 Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fbfd283125 -s ours" into nyc-mr2-dev am: cd955ca6e5 -s ours am: f66ddc099a -s ours am: b277fa8fb9 -s ours by Bill Yi · 8 years ago
  41. 454e489 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 581a166ae1 -s ours am: 603a43e5c3 -s ours am: 81a1d589ba -s ours by Bill Yi · 8 years ago
  42. 0f3e119 Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s ours am: 9cf9d294ef -s ours am: e2f2fbaea1 -s ours am: 6df138613e -s ours" into oc-mr1-dev by Android Build Merger (Role) · 8 years ago
  43. 9623c91 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103 -s ours am: 995029b529 -s ours am: e861cf8791 -s ours am: 9d5cc8b67f -s ours" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  44. 946af38 Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 581a166ae1 -s ours am: 603a43e5c3 -s ours am: 81a1d589ba -s ours am: 27735ae948 -s ours" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  45. 59ac126 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s ours am: 9cf9d294ef -s ours am: e2f2fbaea1 -s ours by Bill Yi · 8 years ago
  46. d4ed61f Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103 -s ours am: 995029b529 -s ours am: e861cf8791 -s ours by Bill Yi · 8 years ago
  47. 1be0033 Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 581a166ae1 -s ours am: 603a43e5c3 -s ours am: 81a1d589ba -s ours am: ce64f8f63d -s ours" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  48. c367c765 Merge "Merge "Merge "Import translations. DO NOT MERGE am: 69d0838208 -s ours" into nyc-mr2-dev am: 3bcdbff889 -s ours am: 6f24c015ef -s ours am: 3c1c07a9fe -s ours" into oc-dr1-dev-plus-aosp am: a9ea1f2f65 -s ours" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  49. 8091679 Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 4ba2bc4d32 -s ours am: 8080362358 -s ours am: 0ceb3853e8 -s ours am: fdcb482a98 -s ours" into oc-mr1-dev by Android Build Merger (Role) · 8 years ago
  50. 6a6275a Merge "Merge "Unhide get/setTextClassifier in WebView" into oc-mr1-dev am: 2ebddfc398" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  51. a546239 Merge "Merge "Import translations. DO NOT MERGE am: 69d0838208 -s ours" into nyc-mr2-dev am: 3bcdbff889 -s ours am: 6f24c015ef -s ours am: 3c1c07a9fe -s ours" into oc-dr1-dev-plus-aosp by Bill Yi · 8 years ago
  52. c555c0a Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 4ba2bc4d32 -s ours am: 8080362358 -s ours am: 0ceb3853e8 -s ours by Bill Yi · 8 years ago
  53. 2f431d3 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 581a166ae1 -s ours am: 603a43e5c3 -s ours am: 81a1d589ba -s ours by Bill Yi · 8 years ago
  54. db3c4ee Merge "Checks if mResponses is null before using it." into oc-mr1-dev by TreeHugger Robot · 8 years ago
  55. 7a09dfc Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 581a166ae1 -s ours am: 603a43e5c3 -s ours am: 81a1d589ba -s ours by Bill Yi · 8 years ago
  56. d64d242 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602 -s ours am: aec51f497c -s ours am: a204358b18 -s ours am: 1c7370cf31 -s ours" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  57. e7b9553 Merge "Unhide get/setTextClassifier in WebView" into oc-mr1-dev am: 2ebddfc398 by Tima Vaisburd · 8 years ago
  58. 25b5ae7 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103 -s ours am: 995029b529 -s ours by Bill Yi · 8 years ago
  59. 573cabcef Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s ours am: 9cf9d294ef -s ours am: e2f2fbaea1 -s ours by Bill Yi · 8 years ago
  60. a556321 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602 -s ours am: aec51f497c -s ours am: a204358b18 -s ours by Bill Yi · 8 years ago
  61. 30b08f0 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903 -s ours am: 18b818e2dd -s ours am: 415ca774d7 -s ours by Bill Yi · 8 years ago
  62. aa31532 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602 -s ours am: aec51f497c -s ours by Bill Yi · 8 years ago
  63. 6604d33 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 4ba2bc4d32 -s ours am: 8080362358 -s ours am: 0ceb3853e8 -s ours by Bill Yi · 8 years ago
  64. 2ebddfc Merge "Unhide get/setTextClassifier in WebView" into oc-mr1-dev by Tima Vaisburd · 8 years ago
  65. 9b16c7b Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103 -s ours am: 995029b529 -s ours by Bill Yi · 8 years ago
  66. 87404b3 Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fbfd283125 -s ours" into nyc-mr2-dev am: cd955ca6e5 -s ours am: f66ddc099a -s ours am: b277fa8fb9 -s ours by Bill Yi · 8 years ago
  67. 0b190bd9 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602 -s ours am: aec51f497c -s ours am: b57520aae6 -s ours" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  68. ea41d6a Merge "Import translations. DO NOT MERGE am: 69d0838208 -s ours" into nyc-mr2-dev am: 3bcdbff889 -s ours am: 6f24c015ef -s ours am: 3c1c07a9fe -s ours by Bill Yi · 8 years ago
  69. b99a5ac Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s ours am: 9cf9d294ef -s ours am: e2f2fbaea1 -s ours am: f417f591a1 -s ours" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  70. 3564226 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602 -s ours am: aec51f497c -s ours by Bill Yi · 8 years ago
  71. 6d7c3b2 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903 -s ours am: 18b818e2dd -s ours am: 415ca774d7 -s ours" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  72. 76f4f8a Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903 -s ours am: 18b818e2dd -s ours by Bill Yi · 8 years ago
  73. 5c36c40 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s ours am: 9cf9d294ef -s ours am: e2f2fbaea1 -s ours by Bill Yi · 8 years ago
  74. ad679da Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903 -s ours am: 18b818e2dd -s ours by Bill Yi · 8 years ago
  75. b42dbfd10 Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 4ba2bc4d32 -s ours am: 8080362358 -s ours am: 0ceb3853e8 -s ours am: 7395db8492 -s ours" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  76. ce64f8f Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 581a166ae1 -s ours am: 603a43e5c3 -s ours by Bill Yi · 8 years ago
  77. 7d47722 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: a1bde91384 -s ours am: cccb304acf -s ours" into oc-dr1-dev am: ab60d6b44e -s ours by Bill Yi · 8 years ago
  78. 9b8f583 Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fbfd283125 -s ours" into nyc-mr2-dev am: cd955ca6e5 -s ours am: f66ddc099a -s ours by Bill Yi · 8 years ago
  79. d9e058b Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 4ba2bc4d32 -s ours am: 8080362358 -s ours am: 0ceb3853e8 -s ours by Bill Yi · 8 years ago
  80. c2bb7cb Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9bc30ce545 -s ours am: 611a6ffe29 -s ours" into oc-dr1-dev am: 527cd8b04d -s ours am: e0a07a210d -s ours" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  81. f417f59 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s ours am: 9cf9d294ef -s ours by Bill Yi · 8 years ago
  82. 9d5cc8b Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103 -s ours am: 995029b529 -s ours by Bill Yi · 8 years ago
  83. 1047a0b Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fbfd283125 -s ours" into nyc-mr2-dev am: cd955ca6e5 -s ours am: f66ddc099a -s ours by Bill Yi · 8 years ago
  84. b64712c Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9bc30ce545 -s ours am: 611a6ffe29 -s ours" into oc-dr1-dev am: 527cd8b04d -s ours by Bill Yi · 8 years ago
  85. 086a037 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903 -s ours am: 18b818e2dd -s ours am: 126d4923f4 -s ours" into oc-dr1-dev-plus-aosp by Bill Yi · 8 years ago
  86. 27735ae Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 581a166ae1 -s ours am: 603a43e5c3 -s ours by Bill Yi · 8 years ago
  87. ea3b823 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: a1bde91384 -s ours am: cccb304acf -s ours" into oc-dr1-dev am: ab60d6b44e -s ours by Bill Yi · 8 years ago
  88. 6df13861 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s ours am: 9cf9d294ef -s ours by Bill Yi · 8 years ago
  89. a9ea1f2 Merge "Merge "Import translations. DO NOT MERGE am: 69d0838208 -s ours" into nyc-mr2-dev am: 3bcdbff889 -s ours am: 6f24c015ef -s ours am: 3c1c07a9fe -s ours" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  90. b5a2d216 Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9bc30ce545 -s ours am: 611a6ffe29 -s ours" into oc-dr1-dev am: 527cd8b04d -s ours" into oc-dr1-dev-plus-aosp by Bill Yi · 8 years ago
  91. 1c7370c Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602 -s ours am: aec51f497c -s ours by Bill Yi · 8 years ago
  92. fdcb482 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 4ba2bc4d32 -s ours am: 8080362358 -s ours by Bill Yi · 8 years ago
  93. 7395db8 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 4ba2bc4d32 -s ours am: 8080362358 -s ours by Bill Yi · 8 years ago
  94. c8d838c Merge "Import translations. DO NOT MERGE am: 69d0838208 -s ours" into nyc-mr2-dev am: 3bcdbff889 -s ours am: 6f24c015ef -s ours by Bill Yi · 8 years ago
  95. 1c2d7c3 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903 -s ours am: 18b818e2dd -s ours am: 126d4923f4 -s ours" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  96. 2f50c14 Merge "Import translations. DO NOT MERGE am: 69d0838208 -s ours" into nyc-mr2-dev am: 3bcdbff889 -s ours am: 6f24c015ef -s ours by Bill Yi · 8 years ago
  97. 411887f Merge "Merge "resolve merge conflicts of 1e74fdb6842b to oc-mr1-dev" into oc-mr1-dev am: eea2441f0a" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  98. 10182c5 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903 -s ours am: 18b818e2dd -s ours by Bill Yi · 8 years ago
  99. e9f1046 Merge "resolve merge conflicts of 1e74fdb6842b to oc-mr1-dev" into oc-mr1-dev by Antony Sargent · 8 years ago
  100. 1e8ed22 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103 -s ours by Bill Yi · 8 years ago