tree c32fd60880ffa9cbeb2ac510f136c7b7116e7355
parent d1e3e53d7912c16a5b3556d7898079ad7435563c
parent edae39d59aa2155c2d79cca991e163e2284cc355
author TreeHugger Robot <treehugger-gerrit@google.com> 1474415097 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1474415100 +0000

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev