tree 13277254858cf81b355890b9e4360cdcd4a290fe
parent f77899f90b5a6498eda6bdc482c5c0f1ba00fc21
parent 61a75423648a0070406e9b7aeda1a55e173bd467
author Selim Cinek <cinek@google.com> 1430271854 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430271854 +0000

am 61a75423: Merge "Follow up CL for heads up notification refactoring" into mnc-dev

* commit '61a75423648a0070406e9b7aeda1a55e173bd467':
  Follow up CL for heads up notification refactoring