tree 3e4c43275c12c5f7ea40ad0ab975a35a2f59af9a
parent 2142fd2b1307ccc9c148e07db5d49f01db2196c3
parent d460de187e4a08c7a258a295c73e9f936599ae07
author Ajay Panicker <apanicke@google.com> 1474438319 +0000
committer android-build-merger <android-build-merger@google.com> 1474438319 +0000

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37  -s ours am: 6b16f71975 am: dddb99f020 am: cdf3126615 am: bd752f7d88  -s ours am: da12b4b0f0 am: 71831be462 am: 89024c7477
am: d460de187e

Change-Id: I1cd15bbe0dc6005e80ac86aa5d01d01b242b8e52