OSDN Git Service

Merge changes from topic 'call-session-may'
authorTyler Gunn <tgunn@google.com>
Fri, 11 Aug 2017 18:33:44 +0000 (18:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Aug 2017 18:33:44 +0000 (18:33 +0000)
am: 21e4dbb6ed

Change-Id: I20a3a9f7808211187da8434a0b1490081a92e8d8


Trivial merge