tree ad7d3c4c40600ffd1d91afe980425a31ec32d9f5
parent 0450b46ad4dd558b236ff31f6d576a6722ddb0c1
parent 9435830ee48955a943fcaa21eff53cc17ca4e5bf
author Jayachandran Chinnakkannu <jayachandranc@google.com> 1494014777 +0000
committer android-build-merger <android-build-merger@google.com> 1494014777 +0000

Merge "Rename CallStateException ERROR_DISCONNECTED to ERROR_OUT_OF_SERVICE" am: a664f20590 am: 81703ac3c3
am: 9435830ee4

Change-Id: Icdd743398edfa8222051066484ea7d3f046162f0