OSDN Git Service

resolve merge conflicts of e6b6653da899 to nyc-mr2-dev-plus-aosp
authorRobert Greenwalt <rgreenwalt@google.com>
Tue, 3 Jan 2017 19:48:04 +0000 (19:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 Jan 2017 19:48:04 +0000 (19:48 +0000)
commit7751269d37c571716573081da425937ea1fdbdec
treea9a1e5129f06dbe06de281e49d989f94760fc58c
parent50e0a9a396ec05ed6a73d3c09f95244038f8d8e3
parent5f0dad0e647be543d30904aae38dacc0cf0799f8
resolve merge conflicts of e6b6653da899 to nyc-mr2-dev-plus-aosp
am: 5f0dad0e64

Change-Id: Icbd5899dd0c8a35be4c290b3aeab29d46c64e1c0
telephony/java/android/telephony/DisconnectCause.java