| commit | b121103591c3764ddf1e0e0308397d2f4fed8f8d | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Fri Oct 16 20:19:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 16 20:19:34 2015 +0000 |
| tree | 3ea3a54b3225d42ef9b972fb91214b29933babc8 | |
| parent | b39b60b7f065d4f5429ed331bc4c14794fa07711 [diff] | |
| parent | 8f589c97d4cd10913e2842788ba1ea3a3d85ef50 [diff] |
am 8f589c97: (-s ours) am 4039488e: am 70f3528c: am 8b0a1bbd: Merge "DO NOT MERGE Double-check SIP state before issuing a swap-calls command." into mnc-dr-dev * commit '8f589c97d4cd10913e2842788ba1ea3a3d85ef50': DO NOT MERGE Double-check SIP state before issuing a swap-calls command.