OSDN Git Service

resolved conflicts for merge of d0694da4 to mnc-dr-dev
authorTyler Gunn <tgunn@google.com>
Fri, 31 Jul 2015 16:02:32 +0000 (09:02 -0700)
committerTyler Gunn <tgunn@google.com>
Fri, 31 Jul 2015 16:02:32 +0000 (09:02 -0700)
commita21b2e30b246b152b3b3692384de534ade2f3485
treea13af078fdf4dfc0373934ac69cf1e1b72a57655
parent9bc9469807703757f50fffd34ed6b3f6183cdc6e
parentd0694da4fb85bb01e7c0ea7989a78a0e635453ac
resolved conflicts for merge of d0694da4 to mnc-dr-dev

Change-Id: Ifd2636d0e1b7eae15d412cfa0a948a572c905b3a
telecomm/java/android/telecom/Connection.java