tree d84a1afab5edb6491ee35105d62f13bd0a18acac
parent c242bf375bcb63bf29f88bec6dc4167b2c43ec25
parent fa8950be33c777d0305775ee3a364300d454f91b
author Fabrice Di Meglio <fdimeglio@google.com> 1407352051 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1407352051 +0000

am fa8950be: Merge "Fix bug #16800261 Settings app: Device administrator screen padding issue" into lmp-dev

* commit 'fa8950be33c777d0305775ee3a364300d454f91b':
  Fix bug #16800261 Settings app: Device administrator screen padding issue