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