am f60b2d40: am 024191b5: Merge "Fix comment.  It should be \'or\' not \'of\'."

* commit 'f60b2d40b0b8dea2c83335c00fd7767008aa0abe':
  Fix comment.  It should be 'or' not 'of'.