Learn more about cloning repositories
You have read-only access
resolved conflicts for merge of f3804c3c to lmp-sprout-dev Conflicts: telephony/java/android/telephony/TelephonyManager.java Change-Id: Ibdd0b6c2c9901ec46196ac9460a0908dfb739ad4