tree c21905e504d132426e5b44c9a3796d1480d7e72d
parent 1075a27c69ca9d6aae9337d8ad6a52460588b9cc
parent 846362fa06e717784e2e60882c83c20a9350b1a7
author Robin Lee <rgl@google.com> 1436311350 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436311350 +0000

am 846362fa: Merge "Use \'dp\' paddings instead of \'mm\' for VPN dialogs" into mnc-dev

* commit '846362fa06e717784e2e60882c83c20a9350b1a7':
  Use 'dp' paddings instead of 'mm' for VPN dialogs