am 5551aca2: Merge "Move ContentInfoExtender from Notification.java to a...
am 5551aca2: Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev
* commit '5551aca2':
Move ContentInfoExtender from Notification.java to a support library