3e0e3bc617c4fd0e03b88ae04a618381b20a383c - platform/frameworks/base

commit	3e0e3bc617c4fd0e03b88ae04a618381b20a383c	[log] [tgz]
author	Ram <ram.pl@samsung.com>	Thu Jun 26 11:03:44 2014 -0700
committer	Etan Cohen <etancohen@google.com>	Tue Jul 01 02:00:51 2014 +0000
tree	bfd1d06fc82e7449fed5291a40900961a08e82ea
parent	b973baca3b6d83bb29eb468edf3dffd7d7d32e64 [diff]

MS: Adding Support for Emergency APN in Telephony Framework
(base/telephony)

Replacement for https://partner-android-review.googlesource.com/#/c/171175/

Change-Id: I16fc37f5c00ed79f2370bc46554fc7a24c52c4cb
Conflicts:
	core/java/android/net/ConnectivityManager.java

core/java/android/net/ConnectivityManager.java[diff]
core/java/android/net/MobileDataStateTracker.java[diff]
core/res/res/values/config.xml[diff]
services/core/java/com/android/server/ConnectivityService.java[diff]
telephony/java/com/android/internal/telephony/DctConstants.java[diff]
telephony/java/com/android/internal/telephony/PhoneConstants.java[diff]

6 files changed

tree: bfd1d06fc82e7449fed5291a40900961a08e82ea