tree 2b9b7a68af6c3e5f3c89fa18fa159b672020e31d
parent 9dca4453abf6e3db3a8782c9ea3bbccda53a98ee
parent 0785906a2e4b9e14c9f9ee2e72f0049d8536cfc7
author Tyler Gunn <tgunn@google.com> 1500073345 +0000
committer android-build-merger <android-build-merger@google.com> 1500073345 +0000

Merge "Remove passing of SIP history-info information." into oc-dr1-dev
am: 0785906a2e

Change-Id: I6477a9861c07530462bedd93ec359a588daed325