tree 18c49b60076b03ab5f59851af4c9e0786e7bad14
parent 7f1f5596f93989b935c9140093e0f7537dfdf7f7
parent 1ff56cf6b63f8e811a2f0fa78b1f2c7fdfe9bf2c
author Jayachandran Chinnakkannu <jayachandranc@google.com> 1494014960 +0000
committer android-build-merger <android-build-merger@google.com> 1494014960 +0000

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

Change-Id: Ifb8411845b2cac2bb016d554dae06693844e2bc2