tree 0c6362017a33fbf0004c0c5af5b2d3d987488c6f
parent bd1660d07685db20a8278f6496c27ab2d09b8737
parent 988a61cefa6a42ad0117979609888da5a9537e64
author Selim Cinek <cinek@google.com> 1476214056 +0000
committer android-build-merger <android-build-merger@google.com> 1476214056 +0000

Merge "Fixed a bug where the header would flicker weirdly when replying" into nyc-mr1-dev am: 46d1ecbc8f am: cf5795a578
am: 988a61cefa

Change-Id: Ibdc405a526c82fbfa3dab0e09a9a973202f71a82