am 1503623c: am ac70c647: Merge "Fix to a compatibility patch that was missed in ag/587241" into lmp-mr1-dev

* commit '1503623c73935e71ff7c2e4d6bbdf546e7f0b37d':
  Fix to a compatibility patch that was missed in ag/587241
This commit is contained in:
Ihab Awad
2014-12-01 21:46:04 +00:00
committed by Android Git Automerger

View File

@@ -1009,7 +1009,7 @@ public abstract class Connection implements IConferenceable {
} }
/** @hide */ /** @hide */
@Deprecated public final void setCapabilities(int connectionCapabilities) { @SystemApi @Deprecated public final void setCallCapabilities(int connectionCapabilities) {
setConnectionCapabilities(connectionCapabilities); setConnectionCapabilities(connectionCapabilities);
} }