tree 47d9f61970ff6469ce2529d3b84ba84e880d61f8
parent 12871e99d0765ec08c0da8b5a9bdd1c0a59d2c59
parent fb522b6798517e98341f2eeba4ef67d10d09b64e
author Fabrice Di Meglio <fdimeglio@google.com> 1402596484 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402596484 +0000

am 52771816: Merge "Fix Material Preference Framework layout" into lmp-preview-dev

* commit '527718164cbb28dff6be6073ba78515395bcf9e1':
  Fix Material Preference Framework layout