Etan Cohen fa96c94c30 Merge commit '9561e74' into merge2

2015-04-24 13:43:36 -07:00

..

android/telephony

Merge "Adding carrier variables to control certain network settings."

2015-04-23 22:35:10 +00:00

com/android

Merge commit '9561e74' into merge2

2015-04-24 13:43:36 -07:00