[automerger skipped] Have isRinging return true when simulated ringing am:...
[automerger skipped] Have isRinging return true when simulated ringing am: ffd7f93e am: ef984b66 -s ours am: 1cbc97d1 -s ours
am skip reason: Change-Id I300a789d674e4aa777ac2031f4f7286b4d595614 with SHA-1 ffd7f93e is in history
Change-Id: I61a2f5e9e81473e30f490bdc339525df0edeceea