OSDN Git Service

Merge "DO NOT MERGE ANYWHERE" into cw-e-dev
authorBryce Lee <brycelee@google.com>
Tue, 1 Dec 2015 15:37:30 +0000 (15:37 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 1 Dec 2015 15:37:30 +0000 (15:37 +0000)
commit085796bdf5e106abd42db2d0ef7d3aee899a766b
treee3a3aff285bcd4d539d275d57639cabc238fdb18
parent52bdf11583366322ca14d69b895ac451a71245db
parentdd976b1b0dab6655e180eecd0d2c44658b66f529
Merge "DO NOT MERGE ANYWHERE" into cw-e-dev
telecomm/java/android/telecom/Connection.java
telecomm/java/android/telecom/ConnectionService.java