Skip to content
Commit d4ed4363 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 909960ad: (-s ours) am ed9cc555: Reconcile with jb-mr1-release - do not merge 

* commit '909960ad':
parents f809e96f 909960ad
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