tree 2e5d1cb79635e7873ff46916a43b421b8f079760
parent ce51b3b55f3facfce5dccebc73bd1903e163103e
parent 1f75d709c10f49d2e2390b888e766bcfd17da860
author Chung-yih Wang <cywang@google.com> 1244516508 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1244516508 -0700

am 1f75d709: Add VPN and Keystore services and data directories.

Merge commit '1f75d709c10f49d2e2390b888e766bcfd17da860'

* commit '1f75d709c10f49d2e2390b888e766bcfd17da860':
  Add VPN and Keystore services and data directories.