am 864ab9c0: am e6e7947c: Merge "Add 1.7 methods to TimeZone / SimpleTimeZone"

* commit '864ab9c0814e58568415badff2e077f424411ef5':
  Add 1.7 methods to TimeZone / SimpleTimeZone