tree 19193db9978391bbe79b9b2cfaa752a0dacd048f
parent 21558d12d8aafb5b54a17370b186955938f13a23
parent 70b06cc62f0439648df121478b99f434040465a1
author Selim Cinek <cinek@google.com> 1468541628 +0000
committer android-build-merger <android-build-merger@google.com> 1468541628 +0000

Merge \"Fixed the heads up disspearing bug for real\" into nyc-mr1-dev
am: 70b06cc62f

Change-Id: I4f800199c871b862eefd1d813e8ed04f9485d7da