tree 2946a22030f65fba620cc7cdbdae2f3545829ff3
parent 4a6eeca54be26b67fd686add73683831c16d2d6d
parent 766164846662547d710e985f8c6e676c244bf894
author Daniel Xie <dxie@google.com> 1435796841 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435796841 +0000

am 76616484: Merge "Reset DateFormat.is24Hour after each test" into lollipop-mr1-cts-dev

* commit '766164846662547d710e985f8c6e676c244bf894':
  Reset DateFormat.is24Hour after each test