tree e1e8b48d16af4431b2d8cf3e70e8ccff6fe19adc
parent 3d6c7dc1d938c7a796f57e38d2ebc6d4d2cfe0fa
parent 1c1021f954664d661a17bf737fd119eb26b0f521
author Brad Ebinger <breadley@google.com> 1502413387 +0000
committer android-build-merger <android-build-merger@google.com> 1502413387 +0000

Merge "Move ACTION_SIP_INCOMING_CALL back to Manifest" into oc-mr1-dev am: 5aee651772
am: 1c1021f954

Change-Id: Iedf3f698cacbfc3eefb6615949cf67cf487d56a9