summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-02-05 23:21:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-05 23:21:26 +0000
commitf5a7df1576c538b60f9da21a8d0c7db498c02ad1 (patch)
treefd4df5dd30ffb6097efb2bd52a858b472279b741 /media
parentb15c00a551cc5b4d1688ed6b73c6c0f5c0ff7a9f (diff)
parentc3ea7e39e51beeac824e3a204e0b5486dca38e91 (diff)
downloadframeworks_base-f5a7df1576c538b60f9da21a8d0c7db498c02ad1.zip
frameworks_base-f5a7df1576c538b60f9da21a8d0c7db498c02ad1.tar.gz
frameworks_base-f5a7df1576c538b60f9da21a8d0c7db498c02ad1.tar.bz2
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
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions