commit | f68d441c663a249eefa3cb1db51befe0f5a709cb | [log] [tgz] |
---|---|---|
author | Santos Cordon <santoscordon@google.com> | Tue Oct 08 14:43:20 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 08 14:43:20 2013 -0700 |
tree | ac92e0260c7e856fcab865c68dd742cc06c19785 | |
parent | b764befad1563c7b707428c4c10fc08d258855db [diff] | |
parent | 6a1b8eb9d3f8048d85c2759af2dd54bcf3abbb2e [diff] |
am 0b9ca916: am aa48f9e0: Merge "Turn screen on for call-waiting calls" into klp-dev * commit '0b9ca916386da6d976f5a0182d016cf8431c3349': Turn screen on for call-waiting calls