tree c62b5575ba0311895850ab1c5e64b0eae805fba1
parent 75ad93503ad801e1cf76d69e448f955e3ce5c22b
parent 8c5713428379689839330c344c4a800039db0400
author Dake Gu <dake@google.com> 1435043540 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435043540 +0000

am 8c571342: Merge "Supports extra layout space" into lmp-mr1-ub-dev

* commit '8c5713428379689839330c344c4a800039db0400':
  Supports extra layout space