tree ce32d7d744442a7e5478a476272aaf73319b85ca
parent 4427f4e812b24d773d9bdf21a9d6c4da3d3a9c20
parent 07767a9e748fdbdab2297974ad01cb265e7fb5a9
author Chia-chi Yeh <chiachi@android.com> 1319240386 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319240386 -0700

am 07767a9e: (-s ours) Move VpnDialogs into core.mk.

* commit '07767a9e748fdbdab2297974ad01cb265e7fb5a9':
  Move VpnDialogs into core.mk.