tree 35d40e648394bebbb58a1a17609f3ec753e1ef4f
parent e885675d2560660143c73ac628a9e3b3803c2014
parent a664f20590ae46f4c7a55fb7d37bdccfbca7b9f0
author Jayachandran Chinnakkannu <jayachandranc@google.com> 1494014507 +0000
committer android-build-merger <android-build-merger@google.com> 1494014507 +0000

Merge "Rename CallStateException ERROR_DISCONNECTED to ERROR_OUT_OF_SERVICE"
am: a664f20590

Change-Id: I866de672425e2018f0002e03d3ee49d7b0baed40