tree a2e2ba81bdd5d3014dea97e80dc97b069ccd518e
parent c202e175de9ddffd9d28e999890cf001c535c2ad
parent 6e3a90d9b7789b04121a6b773175b97e165ba702
author Mady Mellor <madym@google.com> 1461699969 +0000
committer android-build-merger <android-build-merger@google.com> 1461699969 +0000

Merge "Fix a crash when setting vertical gear location and content view null" into nyc-dev
am: 6e3a90d

* commit '6e3a90d9b7789b04121a6b773175b97e165ba702':
  Fix a crash when setting vertical gear location and content view null

Change-Id: I90b3cb69e8e292f6270a3f7ae0ba6750a41df7c9