Winson Chung e962c85e96 am 1c0090b6: Merge "Disabling shadowing (until bugs are addressed) and refactoring some constants."
* commit '1c0090b6b3348cd7fe9e78e00c41f69cac2cdb7b':
  Disabling shadowing (until bugs are addressed) and refactoring some constants.
2014-05-07 23:43:34 +00:00
..