tree 1bba827598669a7cd866cd0671e47a6353c4d563
parent 9e3d9686a40ae17fa17f43b1bafb5331ebe12e98
parent 73c93f02f77e81fdfdbfd7594fc7d7f12c7cf19a
author Adrian Roos <roosa@google.com> 1506364703 +0000
committer android-build-merger <android-build-merger@google.com> 1506364703 +0000

Merge "FRP: Add config flag for disabling credential FRP" into oc-mr1-dev
am: 73c93f02f7

Change-Id: I647bfc52892b305eb59f446812e142b609172bd4