tree 4116a018c31ac04630c2d61997320ae647400cd6
parent 0a4c2646f4b72fdc78299dbb3dd86a7aecefff08
parent eb6f3f885154914eec6a747265d1f568ae50380c
author Alan Viverette <alanv@google.com> 1423177954 +0000
committer android-build-merger <android-build-merger@google.com> 1423177954 +0000

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

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