OSDN Git Service

Merge "Add extra key for app-specified outgoing call timeout" am: decc6c9d56 am:...
authorHall Liu <hallliu@google.com>
Wed, 15 Feb 2017 22:35:52 +0000 (22:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Feb 2017 22:35:52 +0000 (22:35 +0000)
commitb521143aa1e29566a8f849db4acbf75dcd763dbf
tree0902afd04051b30cd1613dcc4bf7e5f333c7b4cf
parentac0bb1f7b27c4ae95c99900156675080b767cce2
parent38f5001c10aa6e6d911ba0977b38f623a9744f5b
Merge "Add extra key for app-specified outgoing call timeout" am: decc6c9d56 am: 2bc24e252e
am: 38f5001c10

Change-Id: I6e7e67c946205b28440a4daeeab3a002f8d6bccc