1. 96ba9c4 Merge "Migrate most of core networking tests to junit4" am: 9d456cd9c6 am: 7d9588c836 am: c40687f85a by Hugo Benichi · 8 years ago
  2. 550de39 Merge "Migrate most of core networking tests to junit4" am: 9d456cd9c6 am: 7d9588c836 by Hugo Benichi · 8 years ago
  3. c40687f Merge "Migrate most of core networking tests to junit4" am: 9d456cd9c6 by Hugo Benichi · 8 years ago
  4. 7d9588c Merge "Migrate most of core networking tests to junit4" am: 9d456cd9c6 by Hugo Benichi · 8 years ago
  5. 9d456cd Merge "Migrate most of core networking tests to junit4" by Treehugger Robot · 8 years ago
  6. 4a0c5d7 Migrate most of core networking tests to junit4 by Hugo Benichi · 8 years ago
  7. cd9932a Merge "Fixes the broadcast receiver for app updates." by TreeHugger Robot · 8 years ago
  8. 5ff4bcb7e Merge "Set the global priority session immediately after its flag is set" into oc-mr1-dev am: 0e4fcfe95d by Jaewan Kim · 8 years ago
  9. b19789f Merge "Don't recycle replaced nodes in a11y cache" into oc-mr1-dev am: 15c8747ad9 by Phil Weaver · 8 years ago
  10. aceb151 Merge "Set the global priority session immediately after its flag is set" into oc-mr1-dev by Jaewan Kim · 8 years ago
  11. f93d8aa Merge "Fix URI unparceling and clarify an error condition" am: 5f123e6ad6 am: 1c36619f5b am: e95023f55a by Hall Liu · 8 years ago
  12. f2619d4 Merge "Fix URI unparceling and clarify an error condition" into oc-mr1-dev am: adaae4cb91 by Hall Liu · 8 years ago
  13. 0e4fcfe Merge "Set the global priority session immediately after its flag is set" into oc-mr1-dev by TreeHugger Robot · 8 years ago
  14. c06c27c Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa am: d6e3d358d4 -s ours am: bbcb8e4976 am: 753a9ab308 am: 065dc70c5a" into oc-mr1-dev-plus-aosp by Jeff Sharkey · 8 years ago
  15. 4ff7290 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa am: d6e3d358d4 -s ours am: bbcb8e4976 am: 753a9ab308 am: f718585bf4" into oc-mr1-dev-plus-aosp by Jeff Sharkey · 8 years ago
  16. 73e2acb Merge "Don't recycle replaced nodes in a11y cache" into oc-mr1-dev by Phil Weaver · 8 years ago
  17. a0badaf DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 am: 8860624853 am: 7512875224 am: 44adace6c6 am: af93051ac4 -s ours am: 620c5cfda0 am: e286f08000 am: 1b1ea965ee by Jeff Sharkey · 8 years ago
  18. 0a2c716 Merge "Fix URI unparceling and clarify an error condition" am: 5f123e6ad6 am: 1c36619f5b by Hall Liu · 8 years ago
  19. 045c82d Merge "Fix Catalan and Polish hyphenation." by TreeHugger Robot · 8 years ago
  20. 15c8747 Merge "Don't recycle replaced nodes in a11y cache" into oc-mr1-dev by TreeHugger Robot · 8 years ago
  21. 9822017 Merge "Fix URI unparceling and clarify an error condition" into oc-mr1-dev by Hall Liu · 8 years ago
  22. 96a30ab Merge "Improve shortcut backup & restore." by TreeHugger Robot · 8 years ago
  23. 1bfc9ff5 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa am: d6e3d358d4 -s ours am: bbcb8e4976 am: 753a9ab308 am: 065dc70c5a" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  24. adaae4c Merge "Fix URI unparceling and clarify an error condition" into oc-mr1-dev by Hall Liu · 8 years ago
  25. 850e668 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa am: d6e3d358d4 -s ours am: bbcb8e4976 am: 753a9ab308 by Jeff Sharkey · 8 years ago
  26. 27531d1 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 am: 8860624853 am: 7512875224 am: 44adace6c6 am: af93051ac4 -s ours am: 620c5cfda0 am: e286f08000 am: e68565b630 by Jeff Sharkey · 8 years ago
  27. 609a6cf Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa am: d6e3d358d4 -s ours am: bbcb8e4976 am: 753a9ab308 am: f718585bf4" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  28. d1525d9 Merge "Add new Download Error Codes" am: e9bd5449b5 am: 946ff79971 am: 014d73e287 by Brad Ebinger · 8 years ago
  29. e95023f Merge "Fix URI unparceling and clarify an error condition" am: 5f123e6ad6 by Hall Liu · 8 years ago
  30. 74de279 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa am: d6e3d358d4 -s ours am: bbcb8e4976 am: 753a9ab308 by Jeff Sharkey · 8 years ago
  31. 4c8e31d DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 am: 8860624853 am: 7512875224 am: 44adace6c6 am: af93051ac4 -s ours am: 620c5cfda0 am: e286f08000 by Jeff Sharkey · 8 years ago
  32. 1c36619 Merge "Fix URI unparceling and clarify an error condition" am: 5f123e6ad6 by Hall Liu · 8 years ago
  33. d10a908 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 am: 8860624853 am: 7512875224 am: 44adace6c6 am: af93051ac4 -s ours am: 620c5cfda0 am: e286f08000 by Jeff Sharkey · 8 years ago
  34. 898a319 Fix Catalan and Polish hyphenation. by Seigo Nonaka · 8 years ago
  35. 47e8f4d Fixes the broadcast receiver for app updates. by David Chen · 8 years ago
  36. 065dc70 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa am: d6e3d358d4 -s ours am: bbcb8e4976 by Jeff Sharkey · 8 years ago
  37. f718585 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa am: d6e3d358d4 -s ours am: bbcb8e4976 by Jeff Sharkey · 8 years ago
  38. df043ee Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf am: a7f0504849" into oc-dr1-dev-plus-aosp am: 6ef8866b04 by Jeff Sharkey · 8 years ago
  39. 5f123e6 Merge "Fix URI unparceling and clarify an error condition" by Hall Liu · 8 years ago
  40. 1c65520 Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf am: a7f0504849 am: 5712d1fb47" into oc-mr1-dev-plus-aosp by Jeff Sharkey · 8 years ago
  41. 1b1ea96 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 am: 8860624853 am: 7512875224 am: 44adace6c6 am: af93051ac4 -s ours am: 620c5cfda0 by Jeff Sharkey · 8 years ago
  42. bb38194 Merge "Add new Download Error Codes" am: e9bd5449b5 am: 946ff79971 by Brad Ebinger · 8 years ago
  43. cd4e159 Merge "Add missing includes." am: 4be4bb3db7 am: 41c08f49b4 am: e9aaf3c546 by Dan Albert · 8 years ago
  44. e68565b DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 am: 8860624853 am: 7512875224 am: 44adace6c6 am: af93051ac4 -s ours am: 620c5cfda0 by Jeff Sharkey · 8 years ago
  45. 9704426 Don't recycle replaced nodes in a11y cache by Phil Weaver · 8 years ago
  46. 753a9ab DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa am: d6e3d358d4 -s ours by Jeff Sharkey · 8 years ago
  47. ff40949 Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 am: 4a71a2daf6 am: e2a1e9f7d8" into oc-mr1-dev-plus-aosp by Jeff Sharkey · 8 years ago
  48. 6530612 Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf am: a7f0504849" into oc-dr1-dev-plus-aosp by Jeff Sharkey · 8 years ago
  49. 014d73e Merge "Add new Download Error Codes" am: e9bd5449b5 am: 946ff79971 by Brad Ebinger · 8 years ago
  50. d8a053c Merge "Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194" into oc-mr1-dev am: 383ab095f5" into oc-mr1-dev-plus-aosp by Jeff Sharkey · 8 years ago
  51. e286f08 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 am: 8860624853 am: 7512875224 am: 44adace6c6 am: af93051ac4 -s ours by Jeff Sharkey · 8 years ago
  52. bbcb8e4 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa by Jeff Sharkey · 8 years ago
  53. 6f2ab66 Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 am: 4a71a2daf6 am: 0de1d85a01" into oc-mr1-dev-plus-aosp by Jeff Sharkey · 8 years ago
  54. 900699c Merge "Merge "Fix alarm preview volume" into oc-mr1-dev am: b9629cd432" into oc-mr1-dev-plus-aosp by Jean-Michel Trivi · 8 years ago
  55. da968fb Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf am: a7f0504849 am: 5712d1fb47" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  56. d6e3d35 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 by Jeff Sharkey · 8 years ago
  57. 6694c5c Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf am: a7f0504849 by Jeff Sharkey · 8 years ago
  58. 946ff79 Merge "Add new Download Error Codes" am: e9bd5449b5 by Brad Ebinger · 8 years ago
  59. 620c5cf DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 am: 8860624853 am: 7512875224 am: 44adace6c6 by Jeff Sharkey · 8 years ago
  60. caebafa Merge "Add missing includes." am: 4be4bb3db7 am: 41c08f49b4 am: e9aaf3c546 by Dan Albert · 8 years ago
  61. 54bfe3a Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 am: 4a71a2daf6 am: e2a1e9f7d8" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  62. e8af749 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194 am: 8bfef31ce0 by Jeff Sharkey · 8 years ago
  63. 6ef8866 Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf am: a7f0504849" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  64. b969ac5 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 am: 4a71a2daf6 by Jeff Sharkey · 8 years ago
  65. af93051 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 am: 8860624853 am: 7512875224 by Jeff Sharkey · 8 years ago
  66. e9bd544 Merge "Add new Download Error Codes" by Brad Ebinger · 8 years ago
  67. 92d80b7 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb by Jeff Sharkey · 8 years ago
  68. 5712d1f Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf by Jeff Sharkey · 8 years ago
  69. a54bfed Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf by Jeff Sharkey · 8 years ago
  70. e9aaf3c Merge "Add missing includes." am: 4be4bb3db7 am: 41c08f49b4 by Dan Albert · 8 years ago
  71. 289b4d8 Merge "Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194" into oc-mr1-dev am: 383ab095f5" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  72. e3e396a Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194" into oc-mr1-dev by Jeff Sharkey · 8 years ago
  73. 44adace DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 am: 8860624853 by Jeff Sharkey · 8 years ago
  74. a04a837 Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 am: 4a71a2daf6 am: 0de1d85a01" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  75. 2771394 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 am: 4a71a2daf6 by Jeff Sharkey · 8 years ago
  76. 41c08f4 Merge "Add missing includes." am: 4be4bb3db7 by Dan Albert · 8 years ago
  77. a7f0504 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours by Jeff Sharkey · 8 years ago
  78. f1f2a61 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 by Jeff Sharkey · 8 years ago
  79. fd77afd Merge "Merge "Fix alarm preview volume" into oc-mr1-dev am: b9629cd432" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  80. a4f89b1 Improve shortcut backup & restore. by Makoto Onuki · 8 years ago
  81. c4649e2 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194 by Jeff Sharkey · 8 years ago
  82. 47aa351 Merge "Fix alarm preview volume" into oc-mr1-dev am: b9629cd432 by Jean-Michel Trivi · 8 years ago
  83. 3700554 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9 am: 98371ee7c9 am: e0e1c8ae4c by Jeff Sharkey · 8 years ago
  84. 7512875 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 by Jeff Sharkey · 8 years ago
  85. dc5d89e Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9 am: 98371ee7c9 am: e6f60d0fcb am: 4a69ee914c -s ours" by Android Build Merger (Role) · 8 years ago
  86. e2a1e9f Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 by Jeff Sharkey · 8 years ago
  87. 4be4bb3 Merge "Add missing includes." by Treehugger Robot · 8 years ago
  88. 0de1d85 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 by Jeff Sharkey · 8 years ago
  89. 6840891 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9 am: 98371ee7c9 am: e6f60d0fcb by Jeff Sharkey · 8 years ago
  90. 300e6ff DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours by Jeff Sharkey · 8 years ago
  91. 3b47256 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a by Jeff Sharkey · 8 years ago
  92. b49d357 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9 am: 98371ee7c9 by Jeff Sharkey · 8 years ago
  93. fd39b23 Merge "Initial tests for launch bounds." by Bryce Lee · 8 years ago
  94. f65d166 Merge "Removed remaining use of static stack ids." by TreeHugger Robot · 8 years ago
  95. 383ab09 Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194" into oc-mr1-dev by Android Build Merger (Role) · 8 years ago
  96. 97f6a0d Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c by Jeff Sharkey · 8 years ago
  97. fad72cb Fix URI unparceling and clarify an error condition by Hall Liu · 8 years ago
  98. 8860624 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours by Jeff Sharkey · 8 years ago
  99. 6ecf046 Merge "Merge "Check target api version before crashing apps." into oc-mr1-dev am: 4e733f3074 am: c1bcf2ff95" by Android Build Merger (Role) · 8 years ago
  100. 4a69ee9 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9 am: 98371ee7c9 by Jeff Sharkey · 8 years ago