tree 0f20c1c063118d7190fb540d3cf52026b475ac2e
parent d66c375f6103a800e99894920fa456ce248e6c4a
parent 5c503f44802e796677628c0d393ab9cb133c5d21
author Tony Mantler <nicoya@google.com> 1414958068 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414958068 +0000

am 5c503f44: am a276072d: am e5f3bedf: am 953498c6: Merge "Don\'t crash when the MiniDrawerView is too short" into ub-gmail-ur14-dev

* commit '5c503f44802e796677628c0d393ab9cb133c5d21':
  Don't crash when the MiniDrawerView is too short