tree 603e63d12087d51ccc2a1c80253f4e9053aab59f
parent 87396dae15781e1a2afafc7379b1d3fc9192e4fe
parent c227738201521d4c4afb256962f2e18f994d7332
author Selim Cinek <cinek@google.com> 1409932510 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409932510 +0000

am a129a3b8: am 0b0b3f40: am 1f49d9b3: Merge "Fixed a bug where the notifications could overlap when reset" into lmp-dev

* commit 'a129a3b89ec2ba57de4c569f3d629509446fe092':
  Fixed a bug where the notifications could overlap when reset