tree 1d2bd1f005f431d687dd8435d78daac25112ecfd
parent db145648c5d7dd3e13e5e6f6bd5254475413dd65
parent 44e61260797087cffd8d2dde7e180f8edf7d4454
author Jean-Michel Trivi <jmtrivi@google.com> 1498281652 +0000
committer android-build-merger <android-build-merger@google.com> 1498281652 +0000

Merge "Total Silence vs VoIP" into oc-dr1-dev am: 92e1d0ab44
am: 44e6126079

Change-Id: Id9096436fc8d10f672777b31e40dd8e121faa418