tree 2c23feb6b20e3d4634b32b94cde926c946361400
parent 29ed6af7a94b94295891508d4d49c192e3c55736
parent dd5814c471c316091f59febcffedb8d58d693492
author Winson Chung <winsonc@google.com> 1433199116 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433199116 +0000

am dd5814c4: Fixing crash on tablets from merging scheme changes.

* commit 'dd5814c471c316091f59febcffedb8d58d693492':
  Fixing crash on tablets from merging scheme changes.