tree fa41a8717ffc4656a34b90376a5a5582f7963ed7
parent c29fff50322599f53feadf9cf87df9956c9ac44e
parent 4df6c75b99df8901ff04c3ab996aa22c6394b157
author Hiroki Yamamoto <hiroki.yamamoto@sonymobile.com> 1491339941 +0000
committer android-build-merger <android-build-merger@google.com> 1491339941 +0000

Merge "Protect CANCEL_HANDOVER_TRANSFER broadcast"
am: 4df6c75b99

Change-Id: If1803f92474fbb6a3dc4aa47674e547443942440