tree a135664c6a920abc12d2d359fde4ba755f3c9dc5
parent b73a3bd336edc8fa22ba61fb24a17036cbefce76
parent d0be6092106400cba7b4e6a407b684bdce633517
author Hiroki Yamamoto <hiroki.yamamoto@sonymobile.com> 1491340179 +0000
committer android-build-merger <android-build-merger@google.com> 1491340179 +0000

Merge "Protect CANCEL_HANDOVER_TRANSFER broadcast" am: 4df6c75b99
am: d0be609210

Change-Id: I8dd81fe9b4bb71b856a023c99594568d0442837c