| commit | 66c2d472c3536c3f9995873172770536cdff99cb | [log] [tgz] |
|---|---|---|
| author | Santos Cordon <santoscordon@google.com> | Thu Aug 27 12:21:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:21:15 2015 +0000 |
| tree | 22a8c4fafef7f8b49e5f05a44b9a44ec88f01449 | |
| parent | f7568de2c6ce2f92f930bb1dea6f78bce5f5e0d3 [diff] | |
| parent | 7aeb79c111da4c4b6c9653782170cbfab972b758 [diff] |
am 7aeb79c1: (-s ours) am c03de65a: Merge "Dont use isPotentialEmergency for our emergency logic." into mnc-dev * commit '7aeb79c111da4c4b6c9653782170cbfab972b758':