| commit | 58f49a20bf975d65286fef42fa29db7e0bc1c9a6 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Jun 02 21:16:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 02 21:16:31 2015 +0000 |
| tree | 55e54ac57653380e5e1c64696a1bb99e2adff507 | |
| parent | 1edaacd1f246cf957aa80e9b7550d35d0ef2b7b1 [diff] | |
| parent | 13d03e9c615cf5ad4288960fceeb888c1d9b559e [diff] |
am 13d03e9c: am 5b2792a3: Merge "Only show emergency actions if enabled" into mnc-dev * commit '13d03e9c615cf5ad4288960fceeb888c1d9b559e': Only show emergency actions if enabled