OSDN Git Service

am 96e25b8d: Merge "Only show emergency app preference if enabled" into mnc-dev
authorAdrian Roos <roosa@google.com>
Tue, 2 Jun 2015 20:55:01 +0000 (20:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 2 Jun 2015 20:55:01 +0000 (20:55 +0000)
commit63a885d39f2acdf59a348d9d9f558327ff0b5780
treec5019466d078c0563685b24f9fa81eef2de8ec34
parent8c48a9b11961d41c8a090d38daeb972462dcec45
parent96e25b8d938082715f93bd071eb386a2174b910d
am 96e25b8d: Merge "Only show emergency app preference if enabled" into mnc-dev

* commit '96e25b8d938082715f93bd071eb386a2174b910d':
  Only show emergency app preference if enabled