| commit | 102578f0d5c26b44c3022c76c432700c381424b6 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Sep 21 06:11:36 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Sep 21 06:11:39 2016 +0000 |
| tree | 3e4c43275c12c5f7ea40ad0ab975a35a2f59af9a | |
| parent | 3227fc31d61a4086d1eed231ab90b20543903259 [diff] | |
| parent | 2142fd2b1307ccc9c148e07db5d49f01db2196c3 [diff] |
Merge "Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc am: cdff42091b am: 9a66565324 -s ours am: dcb78c9cf1 am: 3ed9e7693d am: 853e39d3d9 am: 232824e01c -s ours am: 257cf16de3 am: c96f655395 am: 4a496b0810 am: 03ff2e19cb" into nyc-mr1-dev-plus-aosp