9c3f18846aaa9340cc222f825c9c32ec42f9d0c9 - fp2-dev/platform/frameworks/base

commit	9c3f18846aaa9340cc222f825c9c32ec42f9d0c9	[log] [tgz]
author	Ihab Awad <ihab@google.com>	Mon Jun 30 21:17:13 2014 -0700
committer	Ihab Awad <ihab@google.com>	Wed Jul 02 12:27:13 2014 -0700
tree	3a93eebc6ead619434fe8fbdee2a81ea4f479e79
parent	1e1f2e89267f17723a2afc90a7e894e01fc64701 [diff]

Rename Telecomm "Subscription" to "Account" (1/7)

Change-Id: Ieb29f6ba9dadacb2c7e26969a47141e11a339a40

Conflicts:
	telecomm/java/android/telecomm/InCallCall.java

api/current.txt[diff]
core/java/android/provider/CallLog.java[diff]
telecomm/java/android/telecomm/CallInfo.java[diff]
telecomm/java/android/telecomm/ConnectionRequest.java[diff]
telecomm/java/android/telecomm/ConnectionService.java[diff]
telecomm/java/android/telecomm/InCallCall.java[diff]
telecomm/java/android/telecomm/PhoneAccount.aidl[Renamed from telecomm/java/android/telecomm/Subscription.aidl - diff]
telecomm/java/android/telecomm/PhoneAccount.java[Renamed from telecomm/java/android/telecomm/Subscription.java - diff]
telecomm/java/android/telecomm/RemoteConnectionManager.java[diff]
telecomm/java/android/telecomm/RemoteConnectionService.java[diff]
telecomm/java/com/android/internal/telecomm/ITelecommService.aidl[diff]
telephony/java/android/telephony/TelephonyManager.java[diff]

12 files changed

tree: 3a93eebc6ead619434fe8fbdee2a81ea4f479e79