Commit 9782ac58 authored by keunyoung's avatar keunyoung Committed by Android Git Automerger
Browse files

am 5a513a5f: (-s ours) am 37388df7: am a419aef2: am 8c1ee69b: DO NOT MERGE... 

am 5a513a5f: (-s ours) am 37388df7: am a419aef2: am 8c1ee69b: DO NOT MERGE resolved conflicts for merge of 317bb63c to jb-mr1-dev

* commit '5a513a5f':
  DO NOT MERGE verifier to R6
parents 148c7bda 5a513a5f
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment