tree 9116136ef05e94531e0765dbec297241a6f481d8
parent 7d28ff47a46ebd5c065f26778a21ef1db6a90e0b
parent 38ed1ff4b7a4b1206f74933fe1ab510ac957586c
author Tyler Gunn <tgunn@google.com> 1408743678 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408743678 +0000

am 38ed1ff4: am 6d78f603: Merge "Defaulting InCall UI to portrait." into lmp-dev

* commit '38ed1ff4b7a4b1206f74933fe1ab510ac957586c':
  Defaulting InCall UI to portrait.