OSDN Git Service

Merge "Only show emergency app preference if enabled" into mnc-dev
authorAdrian Roos <roosa@google.com>
Tue, 2 Jun 2015 20:50:34 +0000 (20:50 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 2 Jun 2015 20:50:45 +0000 (20:50 +0000)

Trivial merge