tree fd4df5dd30ffb6097efb2bd52a858b472279b741
parent b15c00a551cc5b4d1688ed6b73c6c0f5c0ff7a9f
parent c3ea7e39e51beeac824e3a204e0b5486dca38e91
author Alan Viverette <alanv@google.com> 1423178486 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423178486 +0000

am c3ea7e39: am 69a62a8b: Merge "Update preference dialog padding to Material" into lmp-mr1-dev automerge: eb6f3f8

* commit 'c3ea7e39e51beeac824e3a204e0b5486dca38e91':
  Update preference dialog padding to Material