| commit | 0bc1f71c30329f2cce5087a6e453617778dcb15f | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Jun 02 21:26:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 02 21:26:04 2015 +0000 |
| tree | f656036bfef588125c9d0716498edf902a20ab68 | |
| parent | 93ca0df9d6dae000539c1b870a14b1dda5ff1c5d [diff] | |
| parent | 58f49a20bf975d65286fef42fa29db7e0bc1c9a6 [diff] |
am 58f49a20: am 13d03e9c: am 5b2792a3: Merge "Only show emergency actions if enabled" into mnc-dev * commit '58f49a20bf975d65286fef42fa29db7e0bc1c9a6': Only show emergency actions if enabled