tree c22f4c736c650175cb9ebc3a2e352d2818f67ebb
parent 773deddaf5d5cf358b135cd670d247936d0430d0
parent e71f583c782a98e977d6a5c450dff856b132e5c6
author TreeHugger Robot <treehugger-gerrit@google.com> 1485189416 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1485189420 +0000

Merge "Strong auth timeout refactor"