tree ce65ab740b4d4907fd936592394c7141a4f55380
parent c6f7180f0c6a79f815e83c2c58165860befbae60
parent 5aee651772a4b43e4a61be526a72033ebb7474e8
author Brad Ebinger <breadley@google.com> 1502413078 +0000
committer android-build-merger <android-build-merger@google.com> 1502413078 +0000

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

Change-Id: I9d1347055c90a49d141da6d34c85ab2a7cb080c1