tree 0f5aa1fa751a41f2088f8586145cc54dfe0252c1
parent dabf4e4149404c85ff221e80f371909ade2834f4
parent df7bbfd7c28549742443bbf91200871c09e89299
author John Wang <johnwang@google.com> 1337621588 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1337621588 -0700

Merge "Only reset time from NITZ in zone fix." into jb-dev