tree d65bbc98af84ab0678d905c1d0ef5b4d1c7577cd
parent 44c534d88ae1153c8d29cee27de4131cd7215273
parent b9144cea5184c90534db75b47e3818a688e64d5b
author Chris Wren <cwren@android.com> 1414782920 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414782920 +0000

am b9144cea: Merge "Clear the initialized flag when resetting the height." into lmp-mr1-dev

* commit 'b9144cea5184c90534db75b47e3818a688e64d5b':
  Clear the initialized flag when resetting the height.