| commit | 63a885d39f2acdf59a348d9d9f558327ff0b5780 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Jun 02 20:55:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 02 20:55:01 2015 +0000 |
| tree | c5019466d078c0563685b24f9fa81eef2de8ec34 | |
| parent | 8c48a9b11961d41c8a090d38daeb972462dcec45 [diff] | |
| parent | 96e25b8d938082715f93bd071eb386a2174b910d [diff] |
am 96e25b8d: Merge "Only show emergency app preference if enabled" into mnc-dev * commit '96e25b8d938082715f93bd071eb386a2174b910d': Only show emergency app preference if enabled