tree 26f67875fd6c5dc0dd0ec8929889a9e08a853488
parent 1750ab4e2192326b7f819ff901f9bc38ad4e93dc
parent 91f33cd5ae3f09b7d2e614f5d0809037c1708db1
author Elliott Hughes <enh@google.com> 1469088871 +0000
committer android-build-merger <android-build-merger@google.com> 1469088871 +0000

Merge \"Treat \"persist.sys.timezone\" as being a Java-format timezone.\"
am: 91f33cd5ae

Change-Id: Iafd50c6b6b44166f2fdf1506dbcbe5c788568966