Skip to content
Commit a95f7d77 authored by Jim Miller's avatar Jim Miller Committed by android-build-merger
Browse files

Merge "resolve merge conflicts of f950ec9b to nyc-dev" into nyc-dev 

am: 0db3ad24

* commit '0db3ad24':
  Fix missing permission check when saving pattern/password

Change-Id: Iec05d3688aa270cfa6fa8ead54fd1a933591786d
parents e818ac4a 0db3ad24
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment