| commit | 35e3db744e0f79a9ed84cfc97997abc371f1d3dd | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Mon May 18 23:56:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 18 23:56:56 2015 +0000 |
| tree | 941686bf2ac0fcec21a8c39ea96f5e468918bb30 | |
| parent | c3aa249f3c87250f2c9e203a75771d4b1df43153 [diff] | |
| parent | 7034954f91c94b0f07db1417a016ec9d6f7775ec [diff] |
am 7034954f: Merge "Prevent EmergencyDialer restart from Keyguard" into mnc-dev * commit '7034954f91c94b0f07db1417a016ec9d6f7775ec': Prevent EmergencyDialer restart from Keyguard