tree 5c153ebeac0216779c05666f22955f64bbb8d505
parent a2a66def70a7cd70a1d33b694ef4d9924537b6bd
parent 07b072ad2f2e1e6a56e03e3891686762d9a972a7
author Erik <roboerik@android.com> 1283969081 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283969081 -0700

am c4f628a1: am c0b4f6d3: Merge "Adds a time zone parameter to formatDateRange" into gingerbread

Merge commit 'c4f628a1ba359926cf53ed7652d9abba6ea29123'

* commit 'c4f628a1ba359926cf53ed7652d9abba6ea29123':
  Adds a time zone parameter to formatDateRange