tree 556017a6e2f987cc553b8392e959b36ce3aeff77
parent 5c504aac78c847e4c4dd9521c3bd68153eebf953
parent 7e8ff2694ee2af37f8d6a160efa6636421cd879c
author Tony Mantler <nicoya@google.com> 1494526121 +0000
committer android-build-merger <android-build-merger@google.com> 1494526121 +0000

Merge "Preference headers layout has been fixed" am: 9171c25f7d
am: 7e8ff2694e

Change-Id: Ifa38fe77fcf6d586ea85782665a3d6d01db19853