tree 4000165c14cd5fdaf324248afb41faa84207e28a
parent 03e61aa9bb5acf24466e74cad798df6e3455e9c0
parent 476a9ad871956d3fbc3280799d6a3ca09c57b07d
author Lei Yu <jackqdyulei@google.com> 1497492279 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1497492284 +0000

Merge "Revert the time zone display name logic" into oc-dev