| commit | 62b92ab53dd9f7f31d3df5703357477a579e4ef8 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Jun 02 21:16:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 02 21:16:29 2015 +0000 |
| tree | 9831ebe917b0bac1f48afbe781bf70379673c7ef | |
| parent | 3eccde2e05c07b7fd65ba82f21862ae077c7051d [diff] | |
| parent | 63a885d39f2acdf59a348d9d9f558327ff0b5780 [diff] |
am 63a885d3: am 96e25b8d: Merge "Only show emergency app preference if enabled" into mnc-dev * commit '63a885d39f2acdf59a348d9d9f558327ff0b5780': Only show emergency app preference if enabled