tree e6458b336ffc7482140c5fd798efc862975330d4
parent 8f32cd4306a201c2167c20fc636fe613f1fabd4c
parent 8ea2d5f72d8a5e0c68344496ed0b082772874954
author Selim Cinek <cinek@google.com> 1461295332 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461295334 +0000

Merge "Fixed a crash when the heads up content view was null" into nyc-dev