tree 0746509d6debe27d2d3704105e47d58599dc8fbb
parent 540f74786135b5c99170a518ef246ecfd0588739
parent 3c1830bd7f85f35fe216b8bc5bc7f515b8f6d777
author TreeHugger Robot <treehugger-gerrit@google.com> 1522701394 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1522701394 +0000

Merge "Rename trustedUserPresenceRequired." into pi-dev