tree ea85ed5d788076b4d5adb90cb756f799b3dfae34
parent ea61bdd2e59c535910938358b68cce9af5616995
parent 924b73bd0744363c063dc75a879414680c9cbeb4
author Ian Lake <ilake@google.com> 1433958027 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1433958027 +0000

Merge "Ensure NotificationCompat.MediaStyle methods return MediaStyle" into lmp-mr1-ub-dev