am 9eef81ce: am 89558696: Merge "Telephony: Define enable/disable APIs for Cdma CMAS"
Jake Hamby [Tue, 5 Feb 2013 01:19:55 +0000 (17:19 -0800)]
# By Rika Brooks
# Via Android Git Automerger (1) and others
* commit '9eef81ce80e72d68a8349fd84797276cb9cbe957':
  Telephony: Define enable/disable APIs for Cdma CMAS

1  2 
src/java/com/android/internal/telephony/CommandsInterface.java
src/java/com/android/internal/telephony/RIL.java