OSDN Git Service

Merge "Total Silence vs VoIP" into oc-dr1-dev
authorJean-Michel Trivi <jmtrivi@google.com>
Sat, 24 Jun 2017 05:09:51 +0000 (05:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 24 Jun 2017 05:09:51 +0000 (05:09 +0000)
am: 92e1d0ab44

Change-Id: I7a1123ed362d884dfbbee21c8e04595e55844ecd


Trivial merge