tree eecb510d961c9068ea20e977a1a627743b4c6709
parent 1691881763295cc254ea618958bdcee83ebeccd8
parent b36becff0831e48e208495a2c4ccf1a7330aeb58
author Jason Monk <jmonk@google.com> 1421071263 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1421071264 +0000

Merge "Avoid showing emergency calls when not possible" into lmp-mr1-dev