Commit d7ee1e53 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 60998d47: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '60998d47':
parents 2e75ac7f 60998d47
Markdown is supported
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