commit | 33c50fb8c7135d3cc61ce8dc05de806e1f2bf3bf | [log] [tgz] |
---|---|---|
author | Santos Cordon <santoscordon@google.com> | Fri Jul 10 01:43:06 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 10 01:43:06 2015 +0000 |
tree | c4c25a7abfda0a27f8dbc6e7195b0d16c070b652 | |
parent | 29107f098f96e2521d731f4cbd5fb905f92d4ca1 [diff] | |
parent | c03de65abdee1c35fe64fd4194ece8a14d0937fe [diff] |
am c03de65a: Merge "Dont use isPotentialEmergency for our emergency logic." into mnc-dev * commit 'c03de65abdee1c35fe64fd4194ece8a14d0937fe': Dont use isPotentialEmergency for our emergency logic.