tree 3344a353af180b95f593e295a1647bde9b526907
parent f73c009a3d5678fb68f7f99b566c6f7f0921e1c2
parent 8b0d10c870efbe8254f407e02c406c05bedfa0b5
author Nick Kralevich <nnk@google.com> 1387213942 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387213942 +0000

am 8b0d10c8: am a24e9a86: am 02ad8700: am e4335483: Merge "Relabel /data/misc/zoneinfo"

* commit '8b0d10c870efbe8254f407e02c406c05bedfa0b5':
  Relabel /data/misc/zoneinfo