Conflicts: apps/CtsVerifier/AndroidManifest.xml tests/tests/telephony/src/android/telephony/cts/SmsMessageTest.java tools/host/src/com/android/cts/Version.java Change-Id: Ie15a3eb7f002a300469f17e3f906856c07061223