tree 62c167190e4c15aaf99681dc51b1291becc17a60
parent 5783578aad19fd6a5e9efc613816164f52a12ec8
parent 24bbc4bfe14d513838a2912ecd9b44c63db16ffb
author Beverly <beverlyt@google.com> 1526565091 -0700
committer android-build-merger <android-build-merger@google.com> 1526565091 -0700

Merge "Get rid of divider above ringtone selector" into pi-dev
am: 24bbc4bfe1

Change-Id: I3d94d0cc0f7c6ea6c38f4dffed92af9f73d9ebc1