tree 72bf89b0d8fe23a1a6657eec52cb523411dc457a
parent 9bd64e2b88b06c2fba01261a14f7137897baee28
parent a8a4d29aecd1eca223245d1db1231707992c9341
author Selim Cinek <cinek@google.com> 1452730340 +0000
committer android-build-merger <android-build-merger@google.com> 1452730340 +0000

Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev am: d23f1eb0cd am: 804ff964af
am: a8a4d29aec  -s ours

* commit 'a8a4d29aecd1eca223245d1db1231707992c9341':
  Fixed a crash with the heads up manager